From 949428b79d24dd12a84372387a34e3cb93dc6c81 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Fri, 3 Nov 2023 16:24:14 -0700 Subject: [PATCH 01/11] ci: first draft GHA workflow --- .circleci/{config.yml => config-nope.yml} | 0 .github/workflows/ci-cd.yml | 84 +++++++++++++++++++++++ .nvmrc | 1 + 3 files changed, 85 insertions(+) rename .circleci/{config.yml => config-nope.yml} (100%) create mode 100644 .github/workflows/ci-cd.yml create mode 100644 .nvmrc diff --git a/.circleci/config.yml b/.circleci/config-nope.yml similarity index 100% rename from .circleci/config.yml rename to .circleci/config-nope.yml diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml new file mode 100644 index 0000000..c9006b7 --- /dev/null +++ b/.github/workflows/ci-cd.yml @@ -0,0 +1,84 @@ +name: CI/CD + +on: + push: + workflow_dispatch: + +concurrency: + group: '${{ github.workflow }} @ ${{ github.head_ref || github.ref }}' + +permissions: + contents: write # publish a GitHub release + pages: write # deploy to GitHub Pages + issues: write # comment on released issues + pull-requests: write # comment on released pull requests + +jobs: + ci-cd: + strategy: + matrix: + os: + - macos-latest + - windows-latest + runs-on: ${{ matrix.os }} + defaults: + run: + shell: bash + environment: + name: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + cache: 'npm' + node-version-file: '.nvmrc' + - name: Debug info + run: | + cat < Date: Wed, 15 Nov 2023 14:02:11 -0500 Subject: [PATCH 02/11] ci: disable windows for now and see if should sign var works --- .github/workflows/ci-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index c9006b7..13f949d 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -19,7 +19,7 @@ jobs: matrix: os: - macos-latest - - windows-latest + # - windows-latest runs-on: ${{ matrix.os }} defaults: run: From 6adafd713410f0c1b3d67fc2d7d23230d005a909 Mon Sep 17 00:00:00 2001 From: Ron de las Alas Date: Wed, 15 Nov 2023 14:10:29 -0500 Subject: [PATCH 03/11] ci: Conigure fastlane and add matchfile --- .github/workflows/ci-cd.yml | 8 ++++++++ .gitignore | 2 +- fastlane/Matchfile | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 fastlane/Matchfile diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 13f949d..da2e02e 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -26,6 +26,10 @@ jobs: shell: bash environment: name: ${{ matrix.os }} + env: + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + AC_USERNAME: ${{ secrets.AC_USERNAME }} + AC_PASSWORD: ${{ secrets.AC_PASSWORD }} steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -45,6 +49,10 @@ jobs: run: npm ci - name: Test run: npm run test + - name: Setup Keys for Fastlane + uses: webfactory/ssh-agent@v0.7.0 + with: + ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }} - name: Fastlane if: matrix.os == 'macos-latest' && vars.SCRATCH_SHOULD_SIGN run: fastlane circleci diff --git a/.gitignore b/.gitignore index b9e2be3..6d916a2 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ npm-* /locale # Fastlane -**/fastlane/Matchfile +# **/fastlane/Matchfile **/fastlane/report.xml **/fastlane/Preview.html **/fastlane/screenshots diff --git a/fastlane/Matchfile b/fastlane/Matchfile new file mode 100644 index 0000000..d330e4e --- /dev/null +++ b/fastlane/Matchfile @@ -0,0 +1,7 @@ +git_url("git@github.com:scratchfoundation/scratch-fastlane-match-files.git") +storage_mode("git") +type("development") # The default type, can be: appstore, adhoc, enterprise or development +# app_identifier(["tools.fastlane.app", "tools.fastlane.app2"]) +# username("user@fastlane.tools") # Your Apple Developer Portal username +app_identifier("edu.mit.scratch.scratch-desktop") # The bundle identifier of your app +username("bot-apple@scratch.mit.edu") # Your Apple email address From 4d15309414dfa9ef740039b6876f319e2a5d4294 Mon Sep 17 00:00:00 2001 From: Ron de las Alas Date: Thu, 16 Nov 2023 12:50:03 -0500 Subject: [PATCH 04/11] ci: Configure python 2.7 to so runner is compatible with electron build --- .github/workflows/ci-cd.yml | 9 ++++++++- package.json | 2 +- webpack.makeConfig.js | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index da2e02e..04a8e5d 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -49,7 +49,13 @@ jobs: run: npm ci - name: Test run: npm run test + - name: Install Python 2.7 + if: matrix.os == 'macos-latest' + run: | + brew install pyenv + pyenv install 2.7.18 - name: Setup Keys for Fastlane + if: matrix.os == 'macos-latest' uses: webfactory/ssh-agent@v0.7.0 with: ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }} @@ -65,6 +71,7 @@ jobs: # macOS CSC info was set by Fastlane above WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} + PYTHON_PATH: /Users/runner/.pyenv/versions/2.7.18/bin/python run: npm run ${{ vars.SCRATCH_SHOULD_SIGN && 'dist' || 'distDev' }} - name: Zip MAS-Dev build if: matrix.os == 'macos-latest' @@ -74,7 +81,7 @@ jobs: ditto -v -c -k --sequesterRsrc --keepParent --zlibCompressionLevel 9 \ Scratch*.app ../mas-dev-${NPM_APP_VERSION}.zip - name: Upload macOS artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: matrix.os == 'macos-latest' with: name: macOS diff --git a/package.json b/package.json index 0b3ede2..4606f6e 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "repository": { "type": "git", - "url": "git+ssh://git@github.com/LLK/scratch-desktop.git" + "url": "git+ssh://git@github.com/scratchfoundation/scratch-desktop.git" }, "dependencies": { "source-map-support": "^0.5.19" diff --git a/webpack.makeConfig.js b/webpack.makeConfig.js index 6b3c4db..9602828 100644 --- a/webpack.makeConfig.js +++ b/webpack.makeConfig.js @@ -80,7 +80,7 @@ const makeConfig = function (defaultConfig, options) { options: { modules: true, importLoaders: 1, - localIdentName: '[name]_[local]_[hash:base64:5]', + // localIdentName: '[name]_[local]_[hash:base64:5]', camelCase: true } }, { From 6b0846bb40bd7a5526265c6ceaacacbe7706a3d9 Mon Sep 17 00:00:00 2001 From: Ron de las Alas Date: Tue, 28 Nov 2023 11:53:15 -0500 Subject: [PATCH 05/11] ci: Configure and Don't sign Windows build --- .github/workflows/ci-cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 04a8e5d..c55e087 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -19,7 +19,7 @@ jobs: matrix: os: - macos-latest - # - windows-latest + - windows-latest runs-on: ${{ matrix.os }} defaults: run: @@ -90,7 +90,7 @@ jobs: dist/mas/Scratch*.pkg dist/mas-dev-*.zip - name: Upload Windows artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: matrix.os == 'windows-latest' with: name: Windows From 5699bdaaaeb50c458fd6039f7bbf282da3f95150 Mon Sep 17 00:00:00 2001 From: Ron de las Alas Date: Tue, 28 Nov 2023 17:11:19 -0500 Subject: [PATCH 06/11] ci: remove circle config [skip ci] --- .circleci/config-nope.yml | 216 -------------------------------------- 1 file changed, 216 deletions(-) delete mode 100644 .circleci/config-nope.yml diff --git a/.circleci/config-nope.yml b/.circleci/config-nope.yml deleted file mode 100644 index 4e26ee1..0000000 --- a/.circleci/config-nope.yml +++ /dev/null @@ -1,216 +0,0 @@ -version: 2.1 -workflows: - macos: - jobs: - - build_for_macos: - context: scratch-desktop-and-link - windows: - jobs: - - build_for_windows: - context: scratch-desktop-and-link -orbs: - node: circleci/node@5.1.0 - windows: circleci/windows@5.0.0 -aliases: - # condition to indicate whether or not we should sign this build - - &should_sign - or: - - equal: [ develop, << pipeline.git.branch >> ] - - equal: [ main, << pipeline.git.branch >> ] - - equal: [ master, << pipeline.git.branch >> ] - # clear large environment variables from the "scratch-desktop-and-link" context - # this helps when a program (like NPM) encounters errors with a large environment - - &clear_context - CSC_MACOS: "" - MAC_PROVISION_PROFILE: "" - SDM_CERT: "" - SDM_CERT_CA_BUNDLE: "" - SDM_CERT_KEY: "" - WIN_CSC_LINK: "" -jobs: - build_for_macos: - macos: - # See https://circleci.com/docs/using-macos/#supported-xcode-versions for CircleCI's supported Xcode versions - xcode: 12.5.1 - resource_class: macos.x86.medium.gen2 # "medium" has been deprecated - steps: - - node/install: - node-version: "16.*" - - run: node --version && npm --version - - checkout - - node/install-packages: - include-branch-in-cache-key: false - override-ci-command: npm ci --loglevel info --prefer-offline - - run: - name: Test - command: npm run test - - when: - condition: - *should_sign - steps: - - add_ssh_keys - - run: - name: Import CI context - command: | - set -e - fastlane circleci - - restore_cache: - # Caching Homebrew's files (see the save_cache step below) means that Homebrew doesn't have to update as - # much. The Homebrew update can take several minutes without this, but with the cache it tends to take less - # than a minute most of the time. The cache will expire periodically and be replaced by a more up-to-date - # cache, which should effectively cap the amount of updating that Homebrew needs to do on top of the cache. - name: Restore Homebrew cache - key: homebrew-cache-v2 - - run: - name: Work around electron-userland/electron-builder#4964 - environment: - HOMEBREW_NO_AUTO_UPDATE: 1 - command: | - brew install go go-bindata - git -C ~ clone https://github.com/develar/app-builder.git - git -C ~/app-builder checkout b85740334fec875f5dd8dcd22eb1f729599109db - make --directory=~/app-builder build - ln -sfv ~/app-builder/dist/app-builder_darwin_amd64/app-builder ./node_modules/app-builder-bin/mac/ - - save_cache: - name: Save Homebrew cache - paths: - - ~/Library/Caches/Homebrew - - /Library/Caches/Homebrew - key: homebrew-cache-v2 - - build - - run: - name: Move DMG to artifacts directory - command: | - mkdir -p Artifacts/ - mv -v dist/Scratch*.dmg Artifacts/ - - when: - condition: - *should_sign - steps: - - run: - name: Zip MAS-Dev to artifacts directory - # If you use `zip` for this it will throw away some metadata (resource forks?) and - # the app will crash on startup with "EXC_CRASH (Code Signature Invalid)". - # To preserve that metadata, use `ditto` instead. - # See also: https://stackoverflow.com/a/22370486 - command: | - NPM_APP_VERSION="`node -pe "require('./package.json').version"`" - cd dist/mas-dev - ditto -v -c -k --sequesterRsrc --keepParent --zlibCompressionLevel 9 \ - Scratch*.app ../../Artifacts/mas-dev-${NPM_APP_VERSION}.zip - - run: - name: Move PKG to artifacts directory - command: | - mv -v dist/mas/Scratch*.pkg Artifacts/ - - store_artifacts: - path: Artifacts/ - build_for_windows: - executor: - name: windows/default - shell: bash.exe # defaulting to bash at the executor level makes the Node orb kinda work - steps: - - run: - # work around https://github.com/appveyor/ci/issues/2420 which seems to affect CircleCI too - # see also https://circleci.com/docs/2.0/env-vars/#using-parameters-and-bash-environment - name: Work around git-sh-setup issue - shell: bash - command: | - echo 'Adding libexec/git-core to PATH...' - echo 'For more details see https://github.com/appveyor/ci/issues/2420' - echo 'export PATH="$PATH:/c/Program Files/Git/mingw64/libexec/git-core"' >> $BASH_ENV - - run: # node/install doesn't work right on Windows - name: Install Node - # as of today, the Windows image comes with nvm 1.1.7 - # nvm version 1.1.9 fixes an issue leading to "npm ERR! Unexpected token '.'" - # nvm version 1.1.10 will support "nvm install 16" - # but for now it needs the exact version - command: | - choco upgrade --yes nvm.portable - nvm --version - nvm install 16.20.0 - nvm use 16.20.0 - - run: node --version && npm --version - - checkout - - node/install-packages: - # the Node orb doesn't understand the default cache path on Windows - # make sure to use a path that works with Windows Node.js AND MSYS/MinGW bash - cache-path: "C:/tmp/npm-cache" - include-branch-in-cache-key: false - override-ci-command: npm ci --loglevel info --prefer-offline - - run: - name: Test - command: npm run test - environment: *clear_context - - when: - condition: - *should_sign - steps: - - run: - name: Import CI context - shell: bash - command: | - set -e - function decodeToFile () { - if [ -z "$1" ]; then - echo "Missing or invalid filename" - return 1 - fi - if [ -z "$2" ]; then - echo "Missing environment variable contents for file: $1" - return 2 - fi - echo "$2" | base64 --decode > "$1" - } - decodeToFile ~/codesign.pfx "${WIN_CSC_LINK}" - - run: - # In theory this should be unnecessary: the electron-builder documentation says that WIN_CSC_LINK can - # be a base64-encoded certificate, which is what's in the CI context. In practice that leads to an - # signtool.exe finding the certificate but not the key, for reasons I haven't been able to understand. - # Also, because of the non-standard user configuration on CircleCI's Windows VM, attempting to import - # a certificate into the user's certificate store ("Cert:/LocalUser/My") will fail. Instead, this code - # imports the PFX into the machine certificate store. That usually requires Administrator permissions, - # but on CircleCI's setup it works just fine. See also: https://github.com/ShabadOS/desktop/issues/265 - # and https://github.com/ShabadOS/desktop/pull/266 - name: Add CSC to machine store - shell: powershell - command: | - $securePassword = (ConvertTo-SecureString -String $env:WIN_CSC_KEY_PASSWORD -AsPlainText -Force) - Import-PfxCertificate -FilePath ~/codesign.pfx -Password $securePassword -CertStoreLocation "Cert:/LocalMachine/My" - - build - - run: - name: Move Windows build products to artifacts directory - shell: bash - command: | - mkdir -p Artifacts/ - mv dist/{Scratch*.appx,Scratch*.exe} Artifacts/ - - store_artifacts: - path: Artifacts/ -commands: - build: - steps: - - when: - condition: - *should_sign - steps: - - run: - command: npm run dist - no_output_timeout: 30m # macOS notarization can take longer than the default 10 minutes - environment: - # blank big variables to avoid crash on Windows - <<: *clear_context - # let Windows know where to get the PFX (ignored on non-Windows builds) - WIN_CSC_LINK: ~/codesign.pfx - # blank CIRCLE_BUILD_NUM to work around electron-userland/electron-builder#5016 - CIRCLE_BUILD_NUM: "" - # increased Node memory needed for macOS build - NODE_OPTIONS: --max-old-space-size=4096 - - unless: - condition: - *should_sign - steps: - - run: - command: npm run distDev - environment: - <<: *clear_context - # increased Node memory needed for macOS build - NODE_OPTIONS: --max-old-space-size=4096 From b9aed4ef5c8cd928d3cdf098e661d0f20e17da44 Mon Sep 17 00:00:00 2001 From: Ron de las Alas Date: Wed, 29 Nov 2023 10:28:06 -0500 Subject: [PATCH 07/11] ci: Set signing var based on branch name [skip ci] --- .github/workflows/ci-cd.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index c55e087..c57a844 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -1,8 +1,6 @@ name: CI/CD - on: push: - workflow_dispatch: concurrency: group: '${{ github.workflow }} @ ${{ github.head_ref || github.ref }}' @@ -27,9 +25,10 @@ jobs: environment: name: ${{ matrix.os }} env: + SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'main' }} MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - AC_USERNAME: ${{ secrets.AC_USERNAME }} - AC_PASSWORD: ${{ secrets.AC_PASSWORD }} + AC_USERNAME: ${{ github.ref_name == 'main' && secrets.AC_USERNAME }} + AC_PASSWORD: ${{ github.ref_name == 'main' && secrets.AC_PASSWORD }} steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -60,7 +59,7 @@ jobs: with: ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }} - name: Fastlane - if: matrix.os == 'macos-latest' && vars.SCRATCH_SHOULD_SIGN + if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == true run: fastlane circleci - name: Build timeout-minutes: 30 # macOS notarization can take a while @@ -71,10 +70,10 @@ jobs: # macOS CSC info was set by Fastlane above WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} - PYTHON_PATH: /Users/runner/.pyenv/versions/2.7.18/bin/python - run: npm run ${{ vars.SCRATCH_SHOULD_SIGN && 'dist' || 'distDev' }} + PYTHON_PATH: ${{ matrix.os == 'macos-latest' && '/Users/runner/.pyenv/versions/2.7.18/bin/python'}} + run: npm run ${{ env.SCRATCH_SHOULD_SIGN == true && 'dist' || 'distDev' }} - name: Zip MAS-Dev build - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == true run: | NPM_APP_VERSION="`node -pe "require('./package.json').version"`" cd dist/mas-dev From 8b506506ff0ead9ba6df006d05d269d139fbb98c Mon Sep 17 00:00:00 2001 From: Ron de las Alas Date: Wed, 29 Nov 2023 14:12:51 -0500 Subject: [PATCH 08/11] ci: Revert changes to WP config --- webpack.makeConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.makeConfig.js b/webpack.makeConfig.js index 9602828..6b3c4db 100644 --- a/webpack.makeConfig.js +++ b/webpack.makeConfig.js @@ -80,7 +80,7 @@ const makeConfig = function (defaultConfig, options) { options: { modules: true, importLoaders: 1, - // localIdentName: '[name]_[local]_[hash:base64:5]', + localIdentName: '[name]_[local]_[hash:base64:5]', camelCase: true } }, { From 4fb01893d1d353e2c144461c806b08407d9391bf Mon Sep 17 00:00:00 2001 From: Ron de las Alas Date: Wed, 29 Nov 2023 14:17:27 -0500 Subject: [PATCH 09/11] ci: Pull Matchfile info from secrets ci: try pulling env vars into the matchfile --- .github/workflows/ci-cd.yml | 13 ++++++++----- .gitignore | 2 +- fastlane/Matchfile | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index c57a844..3e24b31 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -17,7 +17,7 @@ jobs: matrix: os: - macos-latest - - windows-latest + # - windows-latest runs-on: ${{ matrix.os }} defaults: run: @@ -25,8 +25,7 @@ jobs: environment: name: ${{ matrix.os }} env: - SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'main' }} - MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'gha' }} AC_USERNAME: ${{ github.ref_name == 'main' && secrets.AC_USERNAME }} AC_PASSWORD: ${{ github.ref_name == 'main' && secrets.AC_PASSWORD }} steps: @@ -59,7 +58,11 @@ jobs: with: ssh-private-key: ${{ secrets.FASTLANE_DEPLOY_KEY }} - name: Fastlane - if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == true + env: + GIT_URL: ${{ secrets.FL_GIT_URL }} + STORAGE_MODE: ${{secrets.FL_STORAGE_MODE}} + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == 'true' run: fastlane circleci - name: Build timeout-minutes: 30 # macOS notarization can take a while @@ -73,7 +76,7 @@ jobs: PYTHON_PATH: ${{ matrix.os == 'macos-latest' && '/Users/runner/.pyenv/versions/2.7.18/bin/python'}} run: npm run ${{ env.SCRATCH_SHOULD_SIGN == true && 'dist' || 'distDev' }} - name: Zip MAS-Dev build - if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == true + if: matrix.os == 'macos-latest' && env.SCRATCH_SHOULD_SIGN == 'true' run: | NPM_APP_VERSION="`node -pe "require('./package.json').version"`" cd dist/mas-dev diff --git a/.gitignore b/.gitignore index 6d916a2..950781c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ npm-* /locale # Fastlane -# **/fastlane/Matchfile +## **/fastlane/Matchfile **/fastlane/report.xml **/fastlane/Preview.html **/fastlane/screenshots diff --git a/fastlane/Matchfile b/fastlane/Matchfile index d330e4e..31e7641 100644 --- a/fastlane/Matchfile +++ b/fastlane/Matchfile @@ -1,5 +1,5 @@ -git_url("git@github.com:scratchfoundation/scratch-fastlane-match-files.git") -storage_mode("git") +git_url(ENV.fetch("GIT_URL")) +storage_mode(ENV.fetch("STORAGE_MODE")) type("development") # The default type, can be: appstore, adhoc, enterprise or development # app_identifier(["tools.fastlane.app", "tools.fastlane.app2"]) # username("user@fastlane.tools") # Your Apple Developer Portal username From 05f913e602462b578d003a36f99e47bfb1034532 Mon Sep 17 00:00:00 2001 From: Ron de las Alas Date: Thu, 30 Nov 2023 08:30:43 -0500 Subject: [PATCH 10/11] ci: renable windows --- .github/workflows/ci-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 3e24b31..22608b6 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -17,7 +17,7 @@ jobs: matrix: os: - macos-latest - # - windows-latest + - windows-latest runs-on: ${{ matrix.os }} defaults: run: From ae5bc31eb3362af3012c815349cd579533f434a2 Mon Sep 17 00:00:00 2001 From: Ron de las Alas Date: Thu, 30 Nov 2023 11:04:35 -0500 Subject: [PATCH 11/11] ci: execute signing on main [skip ci] --- .github/workflows/ci-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 22608b6..b4593bd 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -25,7 +25,7 @@ jobs: environment: name: ${{ matrix.os }} env: - SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'gha' }} + SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'main' }} AC_USERNAME: ${{ github.ref_name == 'main' && secrets.AC_USERNAME }} AC_PASSWORD: ${{ github.ref_name == 'main' && secrets.AC_PASSWORD }} steps: