From f44832ed7ac82cc0dd905fd760c1b6bc46e92bb3 Mon Sep 17 00:00:00 2001 From: Matt Cowley Date: Fri, 11 Nov 2022 01:28:02 +0000 Subject: [PATCH] Update workflows with v3 actions + permissions (#404) * Update Spaces workflow * Update Pages workflow * Update test workflow --- .github/workflows/do-spaces-workflow.yml | 14 +++++++----- .github/workflows/gh-pages-workflow.yml | 27 +++++++++++++++--------- .github/workflows/test-workflow.yml | 27 +++++++++++++----------- 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/.github/workflows/do-spaces-workflow.yml b/.github/workflows/do-spaces-workflow.yml index 8130982..e74a8e5 100644 --- a/.github/workflows/do-spaces-workflow.yml +++ b/.github/workflows/do-spaces-workflow.yml @@ -2,17 +2,21 @@ name: Deploy to DigitalOcean Spaces on: push +permissions: + contents: write + jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - - name: Setup Node - uses: actions/setup-node@v3.5.0 + - name: Use Node.js + uses: actions/setup-node@v3 with: - node-version-file: ".nvmrc" + node-version-file: .nvmrc cache: npm - name: Setup NPM @@ -40,7 +44,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: ${{ secrets.SPACES_REGION }} - - name: Leave a comment + - name: Leave a comment on commit run: npm run deploy:spaces:comment env: REPO_NAME: ${{ github.repository }} diff --git a/.github/workflows/gh-pages-workflow.yml b/.github/workflows/gh-pages-workflow.yml index a87bb9f..1e66653 100644 --- a/.github/workflows/gh-pages-workflow.yml +++ b/.github/workflows/gh-pages-workflow.yml @@ -5,17 +5,25 @@ on: branches: - master +permissions: + contents: write + +concurrency: + group: gh-pages-workflow + cancel-in-progress: true + jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - - name: Setup Node - uses: actions/setup-node@v3.5.0 + - name: Use Node.js + uses: actions/setup-node@v3 with: - node-version-file: ".nvmrc" + node-version-file: .nvmrc cache: npm - name: Setup NPM @@ -40,9 +48,8 @@ jobs: NODE_ENV: production - name: Deploy master to GitHub Pages - uses: JamesIves/github-pages-deploy-action@2.0.0 - env: - ACCESS_TOKEN: ${{ secrets.DEV_GITHUB_TOKEN }} - BASE_BRANCH: master - BRANCH: gh-pages - FOLDER: dist + uses: JamesIves/github-pages-deploy-action@v4 + with: + folder: dist + clean: true + single-commit: true diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index a0f32c8..e64c8c2 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -7,12 +7,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - - name: Setup Node - uses: actions/setup-node@v3.5.0 + - name: Use Node.js + uses: actions/setup-node@v3 with: - node-version-file: ".nvmrc" + node-version-file: .nvmrc cache: npm - name: Setup NPM @@ -35,12 +36,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - - name: Setup Node - uses: actions/setup-node@v3.5.0 + - name: Use Node.js + uses: actions/setup-node@v3 with: - node-version-file: ".nvmrc" + node-version-file: .nvmrc cache: npm - name: Setup NPM @@ -63,12 +65,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - - name: Setup Node - uses: actions/setup-node@v3.5.0 + - name: Use Node.js + uses: actions/setup-node@v3 with: - node-version-file: ".nvmrc" + node-version-file: .nvmrc cache: npm - name: Setup NPM