diff --git a/.github/workflows/release-fleetd-chrome-beta.yml b/.github/workflows/release-fleetd-chrome-beta.yml index 8f50b02d60..90f3d4dc27 100644 --- a/.github/workflows/release-fleetd-chrome-beta.yml +++ b/.github/workflows/release-fleetd-chrome-beta.yml @@ -37,13 +37,19 @@ jobs: run: | npm install && npm run test + - name: Set the version + working-directory: ./ee/fleetd-chrome + run: | + echo "FLEETD_CHROME_VERSION=$(npm pkg get version --workspaces=false | tr -d \")" >> $GITHUB_ENV + - name: Build & sign extension working-directory: ./ee/fleetd-chrome env: CHROME_SIGNING_KEY: ${{ secrets.FLEETD_CHROME_SIGNING_KEY_BETA }} run: | echo -e 'FLEET_URL=""\nFLEET_ENROLL_SECRET=""' > .env - npm install && npm run build + npm run build + sed -i "s/FLEETD_CHROME_VERSION/${{ env.FLEETD_CHROME_VERSION }}/g" updates-beta.xml echo "$CHROME_SIGNING_KEY" > chrome.pem /usr/bin/google-chrome --pack-extension=./dist --pack-extension-key=chrome.pem diff --git a/.github/workflows/release-fleetd-chrome.yml b/.github/workflows/release-fleetd-chrome.yml index 6751d7705e..1655b1c865 100644 --- a/.github/workflows/release-fleetd-chrome.yml +++ b/.github/workflows/release-fleetd-chrome.yml @@ -38,13 +38,19 @@ jobs: run: | npm install && npm run test + - name: Set the version + working-directory: ./ee/fleetd-chrome + run: | + echo "FLEETD_CHROME_VERSION=$(npm pkg get version --workspaces=false | tr -d \")" >> $GITHUB_ENV + - name: Build & sign extension working-directory: ./ee/fleetd-chrome env: CHROME_SIGNING_KEY: ${{ secrets.FLEETD_CHROME_SIGNING_KEY }} run: | echo -e 'FLEET_URL=""\nFLEET_ENROLL_SECRET=""' > .env - npm install && npm run build + npm run build + sed -i "s/FLEETD_CHROME_VERSION/${{ env.FLEETD_CHROME_VERSION }}/g" updates.xml echo "$CHROME_SIGNING_KEY" > chrome.pem /usr/bin/google-chrome --pack-extension=./dist --pack-extension-key=chrome.pem diff --git a/ee/fleetd-chrome/CHANGELOG.md b/ee/fleetd-chrome/CHANGELOG.md index 41f70d9d4b..727727bf3a 100644 --- a/ee/fleetd-chrome/CHANGELOG.md +++ b/ee/fleetd-chrome/CHANGELOG.md @@ -1,3 +1,9 @@ +## fleetd-chrome 1.3.1 (May 20, 2024) + +* Fixed bug where fleetd-chrome sent multiple read requests to Fleet server at the same time. + +* Improved console log output messages when Fleet server is down. + ## fleetd-chrome 1.3.0 (Apr 29, 2024) * Created a fix to recover after a rare RuntimeError coming from sqlite web assembly code by reinitializing the DB. diff --git a/ee/fleetd-chrome/README.md b/ee/fleetd-chrome/README.md index f4486488cd..4eb2ea1505 100644 --- a/ee/fleetd-chrome/README.md +++ b/ee/fleetd-chrome/README.md @@ -67,18 +67,17 @@ npm run test ## Release -1. Update CHANGELOG.md by running `version="X.X.X" make changelog-chrome` +1. At the top of the repo, update CHANGELOG.md by running `version="X.X.X" make changelog-chrome` 2. Review CHANGELOG.md -3. Run `npm version X.X.X` to update the version in `package.json` and `package-lock.json` -4. Update [updates.xml](./updates.xml) and [updates-beta.xml](./updates-beta.xml) versions. -5. Commit the changes and tag the commit with `fleetd-chrome-vX.X.X-beta`. This will trigger the beta release workflow. -6. Once the beta release is tested and PR merged, tag the commit with `fleetd-chrome-vX.X.X`. This will trigger the release workflow. -7. Announce the release in the #help-engineering channel in Slack. +3. At `ee/fleetd-chrome`, run `npm version X.X.X` to update the version in `package.json` and `package-lock.json` +4. Commit the changes and tag the commit with `fleetd-chrome-vX.X.X-beta`. This will trigger the beta release workflow. +5. Once the beta release is tested and PR merged, tag the commit with `fleetd-chrome-vX.X.X`. This will trigger the release workflow. +6. Announce the release in the #help-engineering channel in Slack. -Release a new version via GitHub automation. Update the [package.json](./package.json) and [updates.xml](./updates.xml) versions, then tag a commit with `fleetd-chrome-vX.X.X` to kick off the build and deploy. The build is automatically uploaded to R2 and properly configured clients should be able to update immediately when the job completes. Note that automatic updates seem to only happen about once a day in Chrome -- Hit the "Update" button in `chrome://extensions` to trigger the update manually. +Using GitHub Actions, the build is automatically uploaded to R2 and properly configured clients should be able to update immediately when the job completes. Note that automatic updates seem to only happen about once a day in Chrome -- Hit the "Update" button in `chrome://extensions` to trigger the update manually. ### Beta releases Beta releases are pushed to `https://chrome-beta.fleetdm.com/updates.xml` with the extension ID `bfleegjcoffelppfmadimianphbcdjkb`. -Kick off a beta release by updating the [package.json](./package.json) and [updates-beta.xml](./updates-beta.xml) versions, then tag a commit with `fleetd-chrome-vX.X.X-beta` to kick off the build and deploy. +Kick off a beta release by updating the [package.json](./package.json), then tag a commit with `fleetd-chrome-vX.X.X-beta` to kick off the build and deploy. diff --git a/ee/fleetd-chrome/changes/18775-2-main-threads b/ee/fleetd-chrome/changes/18775-2-main-threads deleted file mode 100644 index 621c94758f..0000000000 --- a/ee/fleetd-chrome/changes/18775-2-main-threads +++ /dev/null @@ -1 +0,0 @@ -Fixed bug where fleetd-chrome sent multiple read requests to Fleet server at the same time. diff --git a/ee/fleetd-chrome/changes/18940-error-when-server-down b/ee/fleetd-chrome/changes/18940-error-when-server-down deleted file mode 100644 index 93b9c665fa..0000000000 --- a/ee/fleetd-chrome/changes/18940-error-when-server-down +++ /dev/null @@ -1 +0,0 @@ -Improved console log output messages when Fleet server is down. diff --git a/ee/fleetd-chrome/package-lock.json b/ee/fleetd-chrome/package-lock.json index 1a2b0ffc91..0984574666 100644 --- a/ee/fleetd-chrome/package-lock.json +++ b/ee/fleetd-chrome/package-lock.json @@ -1,12 +1,12 @@ { "name": "fleetd-for-chrome", - "version": "1.3.0", + "version": "1.3.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "fleetd-for-chrome", - "version": "1.3.0", + "version": "1.3.1", "dependencies": { "async-mutex": "^0.5.0", "dotenv": "^16.0.3", diff --git a/ee/fleetd-chrome/package.json b/ee/fleetd-chrome/package.json index ea7bbf7336..e8c3f9e322 100644 --- a/ee/fleetd-chrome/package.json +++ b/ee/fleetd-chrome/package.json @@ -1,7 +1,7 @@ { "name": "fleetd-for-chrome", "description": "Extension for Fleetd on ChromeOS", - "version": "1.3.0", + "version": "1.3.1", "dependencies": { "async-mutex": "^0.5.0", "dotenv": "^16.0.3", diff --git a/ee/fleetd-chrome/updates-beta.xml b/ee/fleetd-chrome/updates-beta.xml index 90bbeda472..56554d590a 100644 --- a/ee/fleetd-chrome/updates-beta.xml +++ b/ee/fleetd-chrome/updates-beta.xml @@ -1,6 +1,6 @@ - + diff --git a/ee/fleetd-chrome/updates.xml b/ee/fleetd-chrome/updates.xml index 1e07bdc864..a09ce904df 100644 --- a/ee/fleetd-chrome/updates.xml +++ b/ee/fleetd-chrome/updates.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file