From 524879a2ed0e5e120dfe32f02d7e1c78069a1108 Mon Sep 17 00:00:00 2001 From: David Nixon Date: Tue, 24 Sep 2024 13:58:29 -0400 Subject: [PATCH 1/4] Update build-pr.yml --- .github/workflows/build-pr.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 646d9b7..8800b8e 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -7,10 +7,10 @@ jobs: build-ubuntu: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 20 - run: sudo apt-get update - run: sudo apt install -y build-essential cmake libsdl2-dev - run: npm ci @@ -20,10 +20,10 @@ jobs: build-brew: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 20 - run: sudo apt-get update - run: sudo apt install -y build-essential cmake git - run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" @@ -35,10 +35,10 @@ jobs: build-mac: runs-on: macos-11 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 20 - name: Install SDL2 with brew run: brew install sdl2 - name: Compile @@ -47,10 +47,10 @@ jobs: check-cpplint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.12.4' - run: sudo apt-get update - run: sudo apt install -y cppcheck - name: Install cpplint @@ -63,7 +63,7 @@ jobs: check-format: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: check format run: clang-format -n src/* |& tee errors - run: test ! -s errors From 5d014d857b592872f29363020f5ea6d7bb8142ca Mon Sep 17 00:00:00 2001 From: David Nixon Date: Tue, 24 Sep 2024 14:04:46 -0400 Subject: [PATCH 2/4] Update build-pr.yml --- .github/workflows/build-pr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 8800b8e..2ae42cb 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -33,7 +33,7 @@ jobs: run: npm ci build-mac: - runs-on: macos-11 + runs-on: macos-14 steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 @@ -51,6 +51,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: '3.12.4' + node-version: 20 - run: sudo apt-get update - run: sudo apt install -y cppcheck - name: Install cpplint From b2ff41de58aa876c5bcfd5e9572d0f359ac389b0 Mon Sep 17 00:00:00 2001 From: David Nixon Date: Tue, 24 Sep 2024 14:08:16 -0400 Subject: [PATCH 3/4] Update build-pr.yml --- .github/workflows/build-pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 2ae42cb..aab5baa 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -51,7 +51,6 @@ jobs: - uses: actions/setup-python@v4 with: python-version: '3.12.4' - node-version: 20 - run: sudo apt-get update - run: sudo apt install -y cppcheck - name: Install cpplint From 594fa017e6f76fabc9bbae2de1f58d5d376a7213 Mon Sep 17 00:00:00 2001 From: David Nixon Date: Tue, 24 Sep 2024 14:08:31 -0400 Subject: [PATCH 4/4] Update .nvmrc --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index a00f43e..9a2a0e2 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v8 +v20