From 84e968d2e249faa0fe49b9ff8d88b36ac0dc5631 Mon Sep 17 00:00:00 2001 From: Frederick O'Brien Date: Sat, 7 Dec 2024 00:01:36 +0000 Subject: [PATCH 1/6] Bump workflow node version to 16 --- .github/workflows/site-preview.yml | 4 ++-- .gitignore | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/site-preview.yml b/.github/workflows/site-preview.yml index 6b8fc490..a4a7b395 100644 --- a/.github/workflows/site-preview.yml +++ b/.github/workflows/site-preview.yml @@ -24,10 +24,10 @@ jobs: repository: audioxide/website path: website # Setup node (including yarn) - - name: Use Node.js 14 + - name: Use Node.js 16 uses: actions/setup-node@v1 with: - node-version: 14 + node-version: 16 # Setup caching for images to reduce processing time - name: Cache images uses: actions/cache@v2.1.3 diff --git a/.gitignore b/.gitignore index a4dc6ba0..51caf258 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ node_modules dist .idea .parcel-cache +.env # Local Netlify folder .netlify From 2f14b5cc527f3faebd63b6c2e72e6217fd51089e Mon Sep 17 00:00:00 2001 From: Frederick O'Brien Date: Sat, 7 Dec 2024 23:58:20 +0000 Subject: [PATCH 2/6] Node 20 --- .github/workflows/site-preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/site-preview.yml b/.github/workflows/site-preview.yml index a4a7b395..1d87a54b 100644 --- a/.github/workflows/site-preview.yml +++ b/.github/workflows/site-preview.yml @@ -24,10 +24,10 @@ jobs: repository: audioxide/website path: website # Setup node (including yarn) - - name: Use Node.js 16 + - name: Use Node.js 20 uses: actions/setup-node@v1 with: - node-version: 16 + node-version: 20 # Setup caching for images to reduce processing time - name: Cache images uses: actions/cache@v2.1.3 From fcfb5e8db524f4a4f5a5418df38d8aa56d93e2f1 Mon Sep 17 00:00:00 2001 From: Frederick O'Brien Date: Sun, 8 Dec 2024 00:07:52 +0000 Subject: [PATCH 3/6] Update site-preview.yml --- .github/workflows/site-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/site-preview.yml b/.github/workflows/site-preview.yml index 1d87a54b..3b1e2bb6 100644 --- a/.github/workflows/site-preview.yml +++ b/.github/workflows/site-preview.yml @@ -54,7 +54,7 @@ jobs: - run: sed -i "s|^\s*environment.*$||g" netlify.toml working-directory: data # Build and deploy the data repo - - run: npx netlify deploy --build --alias data-preview-$CI_REF_NAME_SLUG + - run: npx netlify deploy --build --alias data-preview-${{ env.CI_REF_NAME_SLUG }} working-directory: data env: GITHUB_REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Use the repo specific token From 288413644443e47e5797137f6c23f84045b1caf0 Mon Sep 17 00:00:00 2001 From: Frederick O'Brien Date: Sun, 8 Dec 2024 00:13:47 +0000 Subject: [PATCH 4/6] Revert "Update site-preview.yml" This reverts commit fcfb5e8db524f4a4f5a5418df38d8aa56d93e2f1. --- .github/workflows/site-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/site-preview.yml b/.github/workflows/site-preview.yml index 3b1e2bb6..1d87a54b 100644 --- a/.github/workflows/site-preview.yml +++ b/.github/workflows/site-preview.yml @@ -54,7 +54,7 @@ jobs: - run: sed -i "s|^\s*environment.*$||g" netlify.toml working-directory: data # Build and deploy the data repo - - run: npx netlify deploy --build --alias data-preview-${{ env.CI_REF_NAME_SLUG }} + - run: npx netlify deploy --build --alias data-preview-$CI_REF_NAME_SLUG working-directory: data env: GITHUB_REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Use the repo specific token From 3143821c4f6a652ab37c418f017f2298dd884e90 Mon Sep 17 00:00:00 2001 From: Andrew Bridge Date: Tue, 1 Apr 2025 08:36:44 +0100 Subject: [PATCH 5/6] chore: Upgrade various action versions --- .github/workflows/site-preview.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/site-preview.yml b/.github/workflows/site-preview.yml index 1d87a54b..f44fb200 100644 --- a/.github/workflows/site-preview.yml +++ b/.github/workflows/site-preview.yml @@ -15,22 +15,22 @@ jobs: - uses: FranzDiebold/github-env-vars-action@v2 # Checkout both data and website repos - name: Checkout data - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: data - name: Checkout website - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: audioxide/website path: website # Setup node (including yarn) - name: Use Node.js 20 - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 20 # Setup caching for images to reduce processing time - name: Cache images - uses: actions/cache@v2.1.3 + uses: actions/cache@v4 with: # A list of files, directories, and wildcard patterns to cache and restore path: data/dist @@ -38,7 +38,7 @@ jobs: key: ${{ env.CI_HEAD_REF_SLUG }} # Setup caching for dependencies - name: Cache dependencies - uses: actions/cache@v2.1.3 + uses: actions/cache@v4 with: # A list of files, directories, and wildcard patterns to cache and restore path: | From ee62084e66573e8ca6b86e3147718b9e7a9cf29f Mon Sep 17 00:00:00 2001 From: Andrew Bridge Date: Tue, 1 Apr 2025 09:13:23 +0100 Subject: [PATCH 6/6] fix: install the netlify CLI properly rather than relying on npx --- .github/workflows/site-preview.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/site-preview.yml b/.github/workflows/site-preview.yml index f44fb200..a61de1dc 100644 --- a/.github/workflows/site-preview.yml +++ b/.github/workflows/site-preview.yml @@ -46,6 +46,9 @@ jobs: website/node_modules # An explicit key for restoring and saving the cache key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }} + - name: Install netlify CLI + run: npm install netlify-cli -g + working-directory: data - run: yarn working-directory: data env: @@ -54,7 +57,7 @@ jobs: - run: sed -i "s|^\s*environment.*$||g" netlify.toml working-directory: data # Build and deploy the data repo - - run: npx netlify deploy --build --alias data-preview-$CI_REF_NAME_SLUG + - run: netlify deploy --build --alias data-preview-$CI_REF_NAME_SLUG working-directory: data env: GITHUB_REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Use the repo specific token