From 00f5cdf56ec910e7e335b3774f577f136e815b45 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Wed, 13 Nov 2024 21:59:15 -0800 Subject: [PATCH] ci: switch to GHA (#54) * ci: switch to GHA * chore: bump continuousauth/action version --- .circleci/config.yml | 42 --------------------------------- .github/workflows/release.yml | 35 ++++++++++++++++++++++++++++ .github/workflows/test.yml | 44 +++++++++++++++++++++++++++++++++++ README.md | 2 +- package.json | 3 +++ test/index.spec.ts | 2 +- 6 files changed, 84 insertions(+), 44 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 519b904..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: - name: test-<< matrix.executor >>-<< matrix.node-version >> - pre-steps: - - run: git config --global core.autocrlf input - - when: - condition: - and: - - equal: [ node/macos, << matrix.executor >> ] - - equal: [ '14.16', << matrix.node-version >> ] - steps: - - node/install-rosetta - matrix: - alias: test - parameters: - executor: - - node/linux - - node/macos - - node/windows - 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 - 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..1bc2491 --- /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@732eeb237ac0a0b330a7247f744ddc57898ff9c4 # v1.0.4 + 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..28bc82c --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,44 @@ +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' + os: + - macos-latest + - ubuntu-latest + - windows-latest + runs-on: "${{ matrix.os }}" + steps: + - name: Install Rosetta + if: ${{ matrix.os == 'macos-latest' && 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.os == 'macos-latest' && matrix.node-version == '14.16' && 'x64' || env.RUNNER_ARCH }} + - name: Install + run: yarn install --frozen-lockfile + - name: Test + run: yarn test diff --git a/README.md b/README.md index 2852927..4c1a9f1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ > Flip [Electron Fuses](https://github.com/electron/electron/blob/main/docs/tutorial/fuses.md) and customize your packaged build of Electron -[![CircleCI](https://circleci.com/gh/electron/fuses.svg?style=shield)](https://circleci.com/gh/electron/fuses) +[![Test](https://github.com/electron/fuses/actions/workflows/test.yml/badge.svg)](https://github.com/electron/fuses/actions/workflows/test.yml) [![npm version](http://img.shields.io/npm/v/@electron/fuses.svg)](https://npmjs.org/package/@electron/fuses) ## Usage diff --git a/package.json b/package.json index f3b2b19..0e66c67 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,9 @@ "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, + "publishConfig": { + "provenance": true + }, "scripts": { "build": "tsc", "test": "jest && tsc", diff --git a/test/index.spec.ts b/test/index.spec.ts index 99c2de5..b9b45c0 100644 --- a/test/index.spec.ts +++ b/test/index.spec.ts @@ -102,7 +102,7 @@ describe('flipFuses()', () => { [FuseV1Options.EnableCookieEncryption]: true, }); expect(sentinels).toEqual(2); - }); + }, 120000); // TODO(dsanders11): Remove timeout once we're no longer running CI under Rosetta } describe('strictlyRequireAllFuses', () => {