From d399a2efe1bae20a4a8c003e7db1e825a47bf7a0 Mon Sep 17 00:00:00 2001 From: Martin Schuhfuss Date: Thu, 7 Dec 2023 12:12:08 +0100 Subject: [PATCH] chore: update all workflows --- .github/workflows/dependabot.yml | 8 +-- .github/workflows/gh-pages.yml | 8 +-- .github/workflows/release-please.yml | 75 ++++++++++++++++++++++++++++ .github/workflows/release.yml | 58 --------------------- .github/workflows/test.yml | 26 +++++----- 5 files changed, 98 insertions(+), 77 deletions(-) create mode 100644 .github/workflows/release-please.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index a271121..8a98cc7 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -21,15 +21,17 @@ permissions: jobs: test: uses: ./.github/workflows/test.yml + dependabot: needs: test - runs-on: ubuntu-latest if: ${{ github.actor == 'dependabot[bot]' }} + + runs-on: ubuntu-latest env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.SYNCED_GITHUB_TOKEN_REPO}} steps: - - name: approve + - name: Approve run: gh pr review --approve "$PR_URL" - - name: merge + - name: Merge run: gh pr merge --auto --squash --delete-branch "$PR_URL" diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 13ca794..0bc71d9 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -26,12 +26,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '20' cache: npm - id: configure_pages @@ -62,12 +62,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup node uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '20' cache: npm - name: Install dependencies diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml new file mode 100644 index 0000000..3bb8c4b --- /dev/null +++ b/.github/workflows/release-please.yml @@ -0,0 +1,75 @@ +# Copyright 2021 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +## Runs the release-please action for all new pushes to the main branch. +## This will create new release-PRs, create GitHub releases and update +## the CHANGELOG.md. + +on: + push: + branches: [main] + +permissions: + contents: write + pull-requests: write + +name: Release Please + +jobs: + release-please: + runs-on: ubuntu-latest + steps: + - id: release + name: Release Please + uses: google-github-actions/release-please-action@v3 + + with: + release-type: node + token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }} + package-name: "@googlemaps/adv-markers-utils" + bump-minor-pre-major: true + + # Everything below is for NPM publishing when a release is cut. + # Note the "if" statement on all commands to make sure that publishing + # only happens when a release is cut. + + - if: ${{ steps.release.outputs.release_created }} + name: Checkout + uses: actions/checkout@v3 + + - if: ${{ steps.release.outputs.release_created }} + name: Setup Node for Dependency Installation + uses: actions/setup-node@v3 + with: + node-version: 20 + cache: npm + + - if: ${{ steps.release.outputs.release_created }} + name: Install Dependencies + run: npm ci + + # Now configure node with the registry used for publishing + - if: ${{ steps.release.outputs.release_created }} + name: Setup Node for Publishing + uses: actions/setup-node@v3 + with: + node-version: 20 + registry-url: "https://wombat-dressing-room.appspot.com/" + + - if: ${{ steps.release.outputs.release_created }} + name: Publish + # npm publish will trigger the build via the prepack hook + run: npm publish + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_WOMBAT_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 334de70..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2023 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: Release -on: - push: - branches: - - main -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/setup-node@v3 - with: - node-version: '16' - - name: Checkout - uses: actions/checkout@v3 - with: - token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }} - - uses: actions/cache@v3 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - name: Test - run: | - npm ci - npm run test - - name: Release - uses: cycjimmy/semantic-release-action@v3 - with: - semantic_version: 19 - extra_plugins: | - @semantic-release/commit-analyzer@^9 - semantic-release-interval - @semantic-release/release-notes-generator@^10 - @semantic-release/git - @semantic-release/github@^8 - @semantic-release/npm@^9 - @googlemaps/semantic-release-config - semantic-release-npm-deprecate - env: - GH_TOKEN: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }} - NPM_TOKEN: ${{ secrets.NPM_WOMBAT_TOKEN }} - NODE_OPTIONS: "--max_old_space_size=4096" - RUNNER_DEBUG: 1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8920162..cca46f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,20 +13,22 @@ # limitations under the License. name: Test -on: - - push - - pull_request - - workflow_call +on: [push, pull_request, workflow_call] jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Node + uses: actions/setup-node@v3 with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - run: npm ci - - run: npm run test + node-version: 20 + cache: npm + + - name: Install Dependencies + run: npm ci + + - name: Run Tests + run: npm run test