Skip to content

Commit

Permalink
ci: switch to GHA (#39)
Browse files Browse the repository at this point in the history
Will publish with provenance enabled. `main` currently is blocked from
releasing due to an uncaught linting error which is fixed in this PR, so
merging this PR will trigger a new release.

Also adds Node.js v22 to the test matrix.
  • Loading branch information
dsanders11 authored Nov 6, 2024
1 parent 4fbd62e commit aab2356
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 44 deletions.
43 changes: 0 additions & 43 deletions .circleci/config.yml

This file was deleted.

28 changes: 28 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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
- uses: continuousauth/action@c32f05c950d4e6f4abd8d1d8a46269525e2dbf55 # v1.0.3
with:
project-id: ${{ secrets.CFA_PROJECT_ID }}
secret: ${{ secrets.CFA_SECRET }}
npm-token: ${{ secrets.NPM_TOKEN }}
42 changes: 42 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
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:
- '22.11'
- '20.9'
- '18.17'
- '16.20'
runs-on: windows-latest
steps:
- 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'
- name: Install
run: yarn install --frozen-lockfile
- name: Lint
run: yarn lint
- name: Test (Node.js v20+)
if: ${{ matrix.node-version == '20.9' || matrix.node-version == '22.11' }}
run: yarn test
- name: Test (Node.js < v20)
if: ${{ matrix.node-version != '20.9' && matrix.node-version != '22.11' }}
run: yarn test:loader
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
"url": "https://github.com/electron/windows-sign/issues"
},
"homepage": "https://github.com/electron/windows-sign",
"publishConfig": {
"provenance": true
},
"dependencies": {
"cross-dirname": "^0.1.0",
"debug": "^4.3.4",
Expand Down
2 changes: 1 addition & 1 deletion src/sign-with-signtool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export async function signWithSignTool(options: InternalSignOptions) {
if (hashes.includes(HASHES.sha1)) {
await execute({ ...internalOptions, hash: HASHES.sha1 });
// If we signed with SHA1, we need to append the SHA256 signature:
internalOptions.appendSignature = true
internalOptions.appendSignature = true;
}
if (hashes.includes(HASHES.sha256)) {
await execute({ ...internalOptions, hash: HASHES.sha256 });
Expand Down

0 comments on commit aab2356

Please sign in to comment.