diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ded2d9..8eaaa3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,8 +20,8 @@ jobs: strategy: matrix: node-version: - - 22.x - - 24.x + - 22 + - 24 steps: - uses: actions/checkout@v6 @@ -34,7 +34,7 @@ jobs: - run: npm test - run: npm run build --if-present - name: Save build - if: matrix.node-version == '22.x' + if: matrix.node-version == 22 uses: actions/upload-artifact@v7 with: name: build @@ -58,33 +58,14 @@ jobs: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - npm-publish-build: + npm-publish-dev: needs: build - runs-on: ubuntu-latest - permissions: - id-token: write # Required for OIDC - contents: read - steps: - - uses: actions/download-artifact@v8 - with: - name: build - - uses: actions/setup-node@v6 - with: - node-version: 22.x - registry-url: 'https://registry.npmjs.org' - - name: Update npm to latest (required for OIDC) - run: npm install -g npm@latest - - uses: rlespinasse/github-slug-action@v4.x - - name: Append commit hash to package version - run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json' - - name: Disable pre- and post-publish actions - run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json' - - name: Publish to npm - if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]' - run: npm publish --tag ${{ env.GITHUB_REF_SLUG }} + uses: SolidOS/solidos/.github/workflows/publish-prerelease.yml@main + with: + node_version: 22 npm-publish-latest: - needs: [build, npm-publish-build] + needs: [build] runs-on: ubuntu-latest if: github.ref == 'refs/heads/main' permissions: @@ -96,7 +77,7 @@ jobs: name: build - uses: actions/setup-node@v6 with: - node-version: 22.x + node-version: 22 registry-url: 'https://registry.npmjs.org' - name: Update npm to latest (required for OIDC) run: npm install -g npm@latest