diff --git a/.cirrus.yml b/.cirrus.yml index 274494de0e..203953c854 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -63,7 +63,7 @@ arm_linux_task: memory: 8G env: USE_SYSTEM_FPM: 'true' - ROLLING_UPLOAD_TOKEN: ENCRYPTED[50debc954fd1b46513fa44d6270491edaba4c9c0ab6fbf0a3fb8e3bdfe9e380d203bd90857ae720b5af31d8a02c6389f] + ROLLING_UPLOAD_TOKEN: ENCRYPTED[bda9bda0d9ca3ed72f8efdf33e09c0abe63f568db948b11e348f963dd532c08fdf91e54d7db549b97f763f284c4a96ec] prepare_script: - apt-get update - export DEBIAN_FRONTEND="noninteractive" @@ -135,7 +135,7 @@ silicon_mac_task: APPLEID: ENCRYPTED[549ce052bd5666dba5245f4180bf93b74ed206fe5e6e7c8f67a8596d3767c1f682b84e347b326ac318c62a07c8844a57] APPLEID_PASSWORD: ENCRYPTED[774c3307fd3b62660ecf5beb8537a24498c76e8d90d7f28e5bc816742fd8954a34ffed13f9aa2d1faf66ce08b4496e6f] TEAM_ID: ENCRYPTED[11f3fedfbaf4aff1859bf6c105f0437ace23d84f5420a2c1cea884fbfa43b115b7834a463516d50cb276d4c4d9128b49] - ROLLING_UPLOAD_TOKEN: ENCRYPTED[50debc954fd1b46513fa44d6270491edaba4c9c0ab6fbf0a3fb8e3bdfe9e380d203bd90857ae720b5af31d8a02c6389f] + ROLLING_UPLOAD_TOKEN: ENCRYPTED[bda9bda0d9ca3ed72f8efdf33e09c0abe63f568db948b11e348f963dd532c08fdf91e54d7db549b97f763f284c4a96ec] prepare_script: - brew update - brew uninstall node@20 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66507eb864..91fe79ac82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - 'master' + - 'updated-latest-electron' tags: - '**' pull_request: @@ -14,7 +15,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PYTHON_VERSION: '3.12' NODE_VERSION: 16 - ROLLING_UPLOAD_TOKEN: ${{ secrets.ROLLING_RELEASE_UPLOAD_TOKEN }} + ROLLING_UPLOAD_TOKEN: ${{ secrets.ELECTRON_NEXT_BINARIES_UPLOAD_TOKEN }} # Below variables allow us to quickly control visual tests for each platform RUN_WINDOWS_VT: false RUN_LINUX_VT: true @@ -88,11 +89,11 @@ jobs: - name: Check Pulsar Version if: ${{ runner.os != 'Windows' }} - run: sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`/g" package.json + run: sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`-electron-next/g" package.json - name: Check Pulsar Version - Windows if: ${{ runner.os == 'Windows' }} - run: (Get-Content package.json) -replace '[0-9]*-dev', (date -u +%Y%m%d%H) | Set-Content -Path package.json + run: (Get-Content package.json) -replace '[0-9]*-dev', "$(date -u +%Y%m%d%H)-electron-next" | Set-Content -Path package.json - name: Reinstall Current Node-GYP NodeJS Headers # Overwrite bad headers that get downloaded. @@ -273,7 +274,7 @@ jobs: - name: Check Pulsar Version if: ${{ runner.os != 'Windows' }} - run: sed -i -e "s/[0-9]*-dev/${TIMESTAMP}/g" package.json + run: sed -i -e "s/[0-9]*-dev/${TIMESTAMP}-electron-next/g" package.json env: TIMESTAMP: ${{needs.build.outputs.timestamp}} diff --git a/script/rolling-release-scripts/rolling-release-binary-upload.js b/script/rolling-release-scripts/rolling-release-binary-upload.js index 9cf035ea16..e32c958d28 100644 --- a/script/rolling-release-scripts/rolling-release-binary-upload.js +++ b/script/rolling-release-scripts/rolling-release-binary-upload.js @@ -56,9 +56,9 @@ if (cirrusFlag === "cirrus") { publish({ token: process.env.ROLLING_UPLOAD_TOKEN || process.env.GITHUB_TOKEN, owner: "pulsar-edit", - repo: "pulsar-rolling-releases", + repo: "pulsar-electron-next-binaries", name: packageJson.version, - notes: `Rolling Release: ${packageJson.version}`, + notes: `Pulsar Electron Next version: ${packageJson.version}`, tag: `v${packageJson.version}`, draft: false, prerelease: false,