From bba4cbaa826fd2cf16c32aba146a417bdddb9001 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Tue, 3 Dec 2024 13:00:17 -0800 Subject: [PATCH] ci: switch to GHA --- .circleci/config.yml | 42 -------------------------------- .github/workflows/release.yml | 35 ++++++++++++++++++++++++++ .github/workflows/test.yml | 46 +++++++++++++++++++++++++++++++++++ README.md | 2 +- package.json | 3 +++ 5 files changed, 85 insertions(+), 43 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/test.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 3304d81..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,42 +0,0 @@ -version: 2.1 - -orbs: - cfa: continuousauth/npm@2.1.1 - node: electronjs/node@2.3.1 - -workflows: - test_and_release: - # Run the test jobs first, then the release only when all the test jobs are successful - jobs: - - node/test: - executor: node/macos - name: test-mac-<< matrix.node-version >> - override-ci-command: yarn install --frozen-lockfile --ignore-engines - pre-steps: - - when: - condition: - and: - - equal: [ '14.16', << matrix.node-version >> ] - steps: - - node/install-rosetta - test-steps: - - run: yarn lint - - run: yarn test - use-test-steps: true - matrix: - alias: test-mac - parameters: - node-version: - - '20.9' - - '18.17' - - '16.20' - # Stay below 14.17.0 or nvm tries to download arm64 artifacts which don't exist - - '14.16' - - cfa/release: - requires: - - test-mac - filters: - branches: - only: - - main - context: cfa-release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..a4b607d --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,35 @@ +name: Release + +on: + push: + branches: + - main + +jobs: + test: + uses: ./.github/workflows/test.yml + + release: + name: Release + runs-on: ubuntu-latest + needs: test + environment: npm + permissions: + id-token: write # for CFA and npm provenance + steps: + - name: Checkout + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + persist-credentials: false + - name: Setup Node.js + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 + with: + node-version: 20.x + cache: 'yarn' + - name: Install + run: yarn install --frozen-lockfile + - uses: continuousauth/action@4e8a2573eeb706f6d7300d6a9f3ca6322740b72d # v1.0.5 + with: + project-id: ${{ secrets.CFA_PROJECT_ID }} + secret: ${{ secrets.CFA_SECRET }} + npm-token: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..b2ee7d8 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,46 @@ +name: Test + +on: + pull_request: + branches: + - main + schedule: + - cron: '0 22 * * 3' + workflow_call: + +permissions: + contents: read + +jobs: + test: + name: Test + strategy: + matrix: + node-version: + - '20.9' + - '18.17' + - '16.20' + - '14.16' + runs-on: macos-latest + steps: + - name: Install Rosetta + if: ${{ matrix.node-version == '14.16' }} + run: /usr/sbin/softwareupdate --install-rosetta --agree-to-license + - name: Checkout + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: Setup Node.js + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 + with: + node-version: "${{ matrix.node-version }}" + cache: 'yarn' + architecture: ${{ matrix.node-version == '14.16' && 'x64' || env.RUNNER_ARCH }} + - name: Install (Node.js v16+) + if : ${{ matrix.node-version != '14.16' }} + run: yarn install --frozen-lockfile + - name: Install (Node.js < v16) + if : ${{ matrix.node-version == '14.16' }} + run: yarn install --frozen-lockfile --ignore-engines + - name: Lint + run: yarn lint + - name: Test + run: yarn test diff --git a/README.md b/README.md index 3e69c1e..22f5320 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Electron Notarize > Notarize your Electron apps seamlessly for macOS -[![CircleCI status](https://circleci.com/gh/electron/notarize.svg?style=shield)](https://circleci.com/gh/electron/notarize) +[![Test](https://github.com/electron/notarize/actions/workflows/test.yml/badge.svg)](https://github.com/electron/notarize/actions/workflows/test.yml) [![NPM package](https://img.shields.io/npm/v/@electron/notarize)](https://npm.im/@electron/notarize) ## Installation diff --git a/package.json b/package.json index ea8672c..c4664c3 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,9 @@ "engines": { "node": ">= 10.0.0" }, + "publishConfig": { + "provenance": true + }, "devDependencies": { "@types/debug": "^4.1.5", "@types/fs-extra": "^9.0.1",