From e26351cbf637622b25046725995f4ba8220a3429 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sat, 19 Oct 2024 00:33:10 -0400 Subject: [PATCH 1/9] hopefully this does it --- .github/workflows/ci_suite.yml | 20 ++++++++++---------- .github/workflows/generate_documentation.yml | 4 ++-- .github/workflows/update_tgs_dmapi.yml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 46871b3852..61b3ae6319 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -12,14 +12,14 @@ jobs: name: Run Linters runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Restore SpacemanDMM cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/SpacemanDMM key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }} - name: Restore Yarn cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: tgui/.yarn/cache key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }} @@ -55,9 +55,9 @@ jobs: name: Compile Maps runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Restore BYOND cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/BYOND key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }} @@ -79,14 +79,14 @@ jobs: - 3306 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Restore BYOND cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/BYOND key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }} - name: Restore Yarn cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: tgui/.yarn/cache key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }} @@ -122,9 +122,9 @@ jobs: name: Windows Build runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Restore Yarn cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: tgui/.yarn/cache key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }} diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml index 265e179ff0..b1bf902c69 100644 --- a/.github/workflows/generate_documentation.yml +++ b/.github/workflows/generate_documentation.yml @@ -8,9 +8,9 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/SpacemanDMM key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }} diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml index 19a72d6702..e3400bf3c3 100644 --- a/.github/workflows/update_tgs_dmapi.yml +++ b/.github/workflows/update_tgs_dmapi.yml @@ -11,7 +11,7 @@ jobs: name: Update the TGS DMAPI steps: - name: Clone - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Branch run: | From 812c19549188a663df870fd63d391bd6ec57f1b1 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sat, 19 Oct 2024 00:45:12 -0400 Subject: [PATCH 2/9] Update ci_suite.yml --- .github/workflows/ci_suite.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 61b3ae6319..3c7de71844 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -8,7 +8,7 @@ on: - master jobs: run_linters: - if: !contains(github.event.head_commit.message, '[ci skip]') + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Run Linters runs-on: ubuntu-22.04 steps: @@ -51,7 +51,7 @@ jobs: outputFile: output-annotations.txt compile_all_maps: - if: !contains(github.event.head_commit.message, '[ci skip]') + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Compile Maps runs-on: ubuntu-22.04 steps: @@ -67,7 +67,7 @@ jobs: source $HOME/BYOND/byond/bin/byondsetup tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS run_all_tests: - if: !contains(github.event.head_commit.message, '[ci skip]') + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Integration Tests runs-on: ubuntu-22.04 services: @@ -118,7 +118,7 @@ jobs: tools/build/build --ci -DCIBUILDING bash tools/ci/run_server.sh test_windows: - if: !contains(github.event.head_commit.message, '[ci skip]') + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Windows Build runs-on: windows-latest steps: @@ -141,7 +141,7 @@ jobs: md deploy bash tools/deploy.sh ./deploy - name: Deploy artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: deploy path: deploy From 7359088a1b0c45d86f4c3924a994945422363237 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sat, 19 Oct 2024 00:54:36 -0400 Subject: [PATCH 3/9] Update ci_suite.yml --- .github/workflows/ci_suite.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 3c7de71844..9e0dd18121 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -103,9 +103,6 @@ jobs: mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql - name: Install rust-g run: | - sudo dpkg --add-architecture i386 - sudo apt update || true - sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386 bash tools/ci/install_rust_g.sh - name: Install auxmos run: | From 98b9739e22583f025372516c8830953e6f8555f6 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:06:17 -0400 Subject: [PATCH 4/9] Update dependencies.sh --- dependencies.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dependencies.sh b/dependencies.sh index a9f562ade7..54ed52e7fa 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -13,12 +13,13 @@ export RUST_G_VERSION=0.4.10 #node version export NODE_VERSION=16 export NODE_VERSION_PRECISE=16.13.1 +export NODE_VERSION_LTS=20.12.0 # SpacemanDMM git tag -export SPACEMAN_DMM_VERSION=suite-1.8 +export SPACEMAN_DMM_VERSION=suite-1.9 # Python version for mapmerge and other tools -export PYTHON_VERSION=3.7.9 +export PYTHON_VERSION=3.9.0 # Auxmos git tag export AUXMOS_VERSION=v2.5.1 From 676c60ce401274323fe074f7ad65e5a81c8798c2 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:13:52 -0400 Subject: [PATCH 5/9] Update dependencies.sh --- dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.sh b/dependencies.sh index 54ed52e7fa..e62e7f3644 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -8,7 +8,7 @@ export BYOND_MAJOR=515 export BYOND_MINOR=1634 #rust_g git tag -export RUST_G_VERSION=0.4.10 +export RUST_G_VERSION=3.3.0 #node version export NODE_VERSION=16 From 1637b9da0e410e5b89346f2d79057b56b763b3f7 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:31:37 -0400 Subject: [PATCH 6/9] Update dependencies.sh --- dependencies.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.sh b/dependencies.sh index e62e7f3644..c172f033ff 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -11,9 +11,9 @@ export BYOND_MINOR=1634 export RUST_G_VERSION=3.3.0 #node version -export NODE_VERSION=16 -export NODE_VERSION_PRECISE=16.13.1 -export NODE_VERSION_LTS=20.12.0 +export NODE_VERSION_LTS=20.13.0 +# compatiblility mode MUST work with windows 7 +export NODE_VERSION_COMPAT=20.2.0 # SpacemanDMM git tag export SPACEMAN_DMM_VERSION=suite-1.9 From 35c80d99112c8c80a850bc9faf87fc636906265f Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:35:11 -0400 Subject: [PATCH 7/9] node --- tools/bootstrap/node_.ps1 | 11 ++++++++++- tools/ci/install_node.sh | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/bootstrap/node_.ps1 b/tools/bootstrap/node_.ps1 index ac8d3b343f..53dd65ae60 100644 --- a/tools/bootstrap/node_.ps1 +++ b/tools/bootstrap/node_.ps1 @@ -29,7 +29,16 @@ $Cache = "$BaseDir\.cache" if ($Env:TG_BOOTSTRAP_CACHE) { $Cache = $Env:TG_BOOTSTRAP_CACHE } -$NodeVersion = Extract-Variable -Path "$BaseDir\..\..\dependencies.sh" -Key "NODE_VERSION_PRECISE" +# Get OS version +$OSMajor = (Get-WmiObject -Class Win32_OperatingSystem).Version.Split(".")[0] +# Set Node version based on OS version +if ($OSMajor -lt 10) { + # Anything under Windows 10 + $NodeVersion = Extract-Variable -Path "$BaseDir\..\..\dependencies.sh" -Key "NODE_VERSION_COMPAT" +} +else { + $NodeVersion = Extract-Variable -Path "$BaseDir\..\..\dependencies.sh" -Key "NODE_VERSION_LTS" +} $NodeSource = "https://nodejs.org/download/release/v$NodeVersion/win-x64/node.exe" $NodeTargetDir = "$Cache\node-v$NodeVersion-x64" $NodeTarget = "$NodeTargetDir\node.exe" diff --git a/tools/ci/install_node.sh b/tools/ci/install_node.sh index c21b8f0110..906984ed3f 100755 --- a/tools/ci/install_node.sh +++ b/tools/ci/install_node.sh @@ -5,6 +5,6 @@ source dependencies.sh if [[ -e ~/.nvm/nvm.sh ]]; then source ~/.nvm/nvm.sh - nvm install $NODE_VERSION - nvm use $NODE_VERSION + nvm install $NODE_VERSION_COMPAT + nvm use $NODE_VERSION_COMPAT fi From 989afa2d3795cdf534c393464eba3f0f7fa51d3e Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:47:49 -0400 Subject: [PATCH 8/9] Update ci_suite.yml --- .github/workflows/ci_suite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 9e0dd18121..454a3bc43b 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -29,7 +29,7 @@ jobs: ${{ runner.os }}- - name: Install Tools run: | - pip3 install setuptools + pip3 install setuptools --upgrade bash tools/ci/install_node.sh bash tools/ci/install_spaceman_dmm.sh dreamchecker tools/bootstrap/python -c '' From fdb18045de42987a728cce3e5f5da147d63c2d8c Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:53:43 -0400 Subject: [PATCH 9/9] Update requirements.txt --- tools/requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/requirements.txt b/tools/requirements.txt index 059bd45d7e..e64c8d7b46 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,7 +1,7 @@ -pygit2==1.0.1 -bidict==0.13.1 -Pillow==10.0.1 +pygit2==1.11.1 +bidict==0.22.1 +Pillow==10.3.0 # changelogs -PyYaml==5.4 +PyYaml==6.0.1 beautifulsoup4==4.9.3