[pull] develop from scratchfoundation:develop

.github/workflows/ci-cd.yml

@@ -13,7 +13,6 @@ permissions:
     issues: write # comment on released issues
     pull-requests: write # comment on released pull requests
 
-
 jobs:
     setup:
         runs-on: ubuntu-latest
@@ -22,8 +21,8 @@ jobs:
             JEST_JUNIT_OUTPUT_DIR: test-results
             NODE_OPTIONS: --max-old-space-size=4000
         steps:
-            - uses: actions/checkout@v4
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+            - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
               with:
                   cache: "npm"
                   node-version-file: ".nvmrc"
@@ -41,27 +40,27 @@ jobs:
               run: |
                 npm run test:lint -- --quiet --output-file test-results/eslint/results.xml --format junit
             - name: Store Lint Results
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
               with:
                 name: lint-output
                 path: ./test-results/*
             - name: Cache node_modules
               id: cache-nodemodules
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     node_modules
                 key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
             - name: Cache src/generated
               id: cache-generated
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     src/generated
                 key: ${{ runner.os }}-generated-${{ hashFiles('package-lock.json') }}
             - name: Cache static/microbit
               id: cache-static
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     static/microbit
@@ -73,46 +72,45 @@ jobs:
             JEST_JUNIT_OUTPUT_NAME: unit-results.xml
             JEST_JUNIT_OUTPUT_DIR: test-results/unit
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
             - name: Cache NPM dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     node_modules
                 key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
             - name: Run Unit Tests
               run: npm run test:unit -- --reporters="default" --reporters="jest-junit" --coverage --coverageReporters=text --coverageReporters=lcov --maxWorkers="2"
             - name: Store Unit Test Results
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
               with:
                 name: unit-test-output
                 path: ./test-results/*
     build:
         needs: [setup, test-unit]
         env:
             NODE_OPTIONS: --max-old-space-size=4000
-            DETECT_CHROMEDRIVER_VERSION: "true"
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v4
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+            - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
               with:
                 cache: "npm"
                 node-version-file: ".nvmrc"
             - name: Retrieve node_modules
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     node_modules
                 key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
             - name: Retrieve src/generated
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     src/generated
                 key: ${{ runner.os }}-generated-${{ hashFiles('package-lock.json') }}
             - name: Retireve static/microbit
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     static/microbit
@@ -122,24 +120,24 @@ jobs:
                 NODE_ENV: production
               run: npm run build
             - name: Cache Build Directory
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     ./build
                 key: ${{ runner.os }}-build-${{ hashFiles('package-lock.json') }}
             - name: Cache Dist Directory
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     ./dist
                 key: ${{ runner.os }}-dist-${{ hashFiles('package-lock.json') }}
             - name: Store Build Output
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
               with:
                 name: build-output
                 path: ./build
             - name: Store Dist Output
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
               with:
                 name: dist-output
                 path: ./dist
@@ -150,34 +148,27 @@ jobs:
             JEST_JUNIT_OUTPUT_NAME: results.txt
             JEST_JUNIT_OUTPUT_DIR: test-results/integration
         steps:
-            - uses: actions/checkout@v4
-            - name: Install Chrome Dependencies
-              run: |
-                sudo apt-get update
-                sudo apt-get install -y libgconf-2-4 libatk1.0-0 libatk-bridge2.0-0 libgdk-pixbuf2.0-0 libgtk-3-0 libgbm-dev libnss3-dev libxss-dev libasound2
+            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
             - name: Retrieve npm dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     node_modules
                 key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
             - name: Retrieve Build
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     ./build
                 key: ${{ runner.os }}-build-${{ hashFiles('package-lock.json') }}
-            - uses: browser-actions/setup-chrome@v1
-              with:
-                chrome-version: stable
-              id: setup-chrome
             - run: |
-                echo Installed chromium version: ${{ steps.setup-chrome.outputs.chrome-version }}
-                ${{ steps.setup-chrome.outputs.chrome-path }} --version
+                for F in chrome chromium chromedriver; do
+                    which $F && $F --version || echo Not found: $F
+                done
             - name: Run Integration Tests
               run: npm run test:integration -- --reporters="default" --reporters="jest-junit"
             - name: Store Integration Test Results
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
               with:
                 name: integration-test-output
                 path: ./test-results/*
@@ -186,15 +177,15 @@ jobs:
         if: (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/develop') || (github.ref == 'refs/heads/beta') || startsWith(github.ref, 'refs/heads/hotfix')
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
             - name: Retrieve npm dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     node_modules
                 key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
             - name: Retrieve Dist Directory
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     ./dist
@@ -213,21 +204,21 @@ jobs:
         if: (!(startsWith(github.ref, 'refs/heads/dependabot/') || startsWith(github.ref, 'refs/heads/renovate/')))
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
             - name: Retrieve npm dependencies
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     node_modules
                 key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
             - name: Retrieve Build Directory
-              uses: actions/cache@v3
+              uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3
               with:
                 path:
                     ./build
                 key: ${{ runner.os }}-build-${{ hashFiles('package-lock.json') }}
             - name: Deploy playground to GitHub Pages
-              uses: peaceiris/actions-gh-pages@v3
+              uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3
               with:
                 github_token: ${{ secrets.GITHUB_TOKEN }}
                 publish_dir: ./build

.github/workflows/commitlint.yml

@@ -8,5 +8,5 @@ jobs:
   commitlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: wagoid/commitlint-github-action@v5
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: wagoid/commitlint-github-action@5ce82f5d814d4010519d15f0552aec4f17a1e1fe # v5

.github/workflows/daily-tx-pull.yml

@@ -12,10 +12,10 @@ jobs:
   daily-tx-pull:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
             ref: 'develop'
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
         with:
           cache: 'npm'
           node-version-file: '.nvmrc'

CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.6.7](https://github.com/LLK/scratch-gui/compare/v3.6.6...v3.6.7) (2024-02-17)
+
+
+### Bug Fixes
+
+* **deps:** don't use NPM chromedriver package ([9dd81cb](https://github.com/LLK/scratch-gui/commit/9dd81cb3946410943860ee6f2c82d78f21c64993))
+* **deps:** unpin non-dev dependencies ([f94b201](https://github.com/LLK/scratch-gui/commit/f94b20158ca9de96e36c3719dff0dd212b37273c))
+* **deps:** update dependency scratch-blocks to v1.1.6 ([a5f81a8](https://github.com/LLK/scratch-gui/commit/a5f81a884569a45b2968db03ba5db7e1eb0a803d))
+
 ## [3.6.6](https://github.com/LLK/scratch-gui/compare/v3.6.5...v3.6.6) (2024-01-29)