Skip to content

Commit

Permalink
Merge pull request #90 from mozilla-extensions/revert-version-bump
Browse files Browse the repository at this point in the history 
Revert requirement for 103 and add work-arounds for 102 and earlier
  • Loading branch information
@skhamis
skhamis authored Jun 10, 2022
2 parents 4173bdf + 6231319 commit 1c22239
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
11 changes: 6 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ The general process followed by the addons team is
but at the current time, the maintainers of about-sync don't have the required
permissions. Therefore, the process is:

* Get everything ready for the new release. Note that the addon version inside
manifest.json is not used by this process, so it's not strictly necessary
to bump it.
* Consider bumping the version in `package.json` - that's not strictly necessary
as the final version string will be something like `X.Y.Zbuildid20220601.073719`,
but it makes it easier to work out what's in a version.

* Ensure this revision is tested using the [testing process described above](#testing-a-xpi)
* Find the exact github revision revision you want as the new build; usually current `main`.
Ensure this revision is tested using the [testing process described above](#testing-a-xpi)

* Join the #addons-pipeline slack channel, asking for a release to be built
specifying the git revision - this will typically be `main`.
specifying that exact revision.

* You should be given the link to a "release signing" taskcluster job - in this
job, look for the built, signed .xpi and download it locally.
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"applications": {
"gecko": {
"id": "[email protected]",
"strict_min_version": "103.0a1"
"strict_min_version": "72.0a1"
}
},

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "aboutsync",
"private": true,
"version": "0.19.0",
"version": "0.20.0",
"description": "About Sync Firefox addon",
"scripts": {
"build": "webpack --mode=production && web-ext build",
Expand Down
4 changes: 2 additions & 2 deletions src/CollectionsViewer.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ const collectionComponentBuilders = {
},

async clients(provider, serverRecords) {
const { getFxAccountsSingleton } = importLocal("resource://gre/modules/FxAccounts.jsm");
const fxAccounts = getFxAccountsSingleton();
const { fxAccounts: legacyfxAccounts, getFxAccountsSingleton } = importLocal("resource://gre/modules/FxAccounts.jsm");
const fxAccounts = legacyfxAccounts || getFxAccountsSingleton();
let fxaDevices = [];
if (typeof fxAccounts.device == "object" && "recentDeviceList" in fxAccounts.device) {
// Force a refresh of the device list, so that we always show the most
Expand Down
4 changes: 2 additions & 2 deletions src/main.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ const weaveService = Cc["@mozilla.org/weave/service;1"]
.getService(Ci.nsISupports)
.wrappedJSObject;

const { getFxAccountsSingleton } = importLocal("resource://gre/modules/FxAccounts.jsm");
const fxAccounts = getFxAccountsSingleton();
const { fxAccounts: legacyfxAccounts, getFxAccountsSingleton } = importLocal("resource://gre/modules/FxAccounts.jsm");
const fxAccounts = legacyfxAccounts || getFxAccountsSingleton();

// Returns a promise that resolves when Sync is ready and logged in.
function whenSyncReady() {
Expand Down

1 comment on commit 1c22239

@firefoxci-taskcluster
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh oh! Looks like an error! Details

Taskcluster-GitHub attempted to create a task for this event with the following scopes:

["assume:repo:github.com/mozilla-extensions/aboutsync:tag:0.20.0","queue:route:checks","queue:scheduler-id:taskcluster-github"]

The expansion of these scopes is not sufficient to create the task, leading to the following:

Client ID static/taskcluster/github does not have sufficient scopes and is missing the following scopes:

assume:repo:github.com/mozilla-extensions/aboutsync:branch:0.20.0

This request requires the client to satisfy the following scope expression:

{
  "AllOf": [
    "assume:repo:github.com/mozilla-extensions/aboutsync:branch:0.20.0",
    "queue:route:checks",
    "queue:route:index.xpi.v2.aboutsync.revision.1c22239176259df9e992d69dad6b9541cb41a607.taskgraph.decision",
    "queue:create-task:project:none",
    "queue:scheduler-id:xpi-level-1",
    {
      "AnyOf": [
        "queue:create-task:highest:xpi-1/decision",
        "queue:create-task:very-high:xpi-1/decision",
        "queue:create-task:high:xpi-1/decision",
        "queue:create-task:medium:xpi-1/decision",
        "queue:create-task:low:xpi-1/decision",
        "queue:create-task:very-low:xpi-1/decision",
        "queue:create-task:lowest:xpi-1/decision"
      ]
    }
  ]
}
  • method: createTask
  • errorCode: InsufficientScopes
  • statusCode: 403
  • time: 2022-06-15T10:38:08.510Z

Please sign in to comment.