Skip to content

Commit

Permalink
Merge pull request #195 from ARF-SS13/update-workflows
Browse files Browse the repository at this point in the history
Replicate CB workflow changes
  • Loading branch information
Tk420634 authored Feb 11, 2025
2 parents f57cf37 + 1a6bcce commit 34d9ae7
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 47 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/autobuild_tgui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 25
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '^18'
- name: Build TGUI
Expand Down
59 changes: 31 additions & 28 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,21 @@ jobs:
run_linters:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Run Linters
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/SpacemanDMM
key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }}
- name: "Setup python"
uses: actions/setup-python@v5
with:
python-version: '3.9'
- name: Install Tools
run: |
sudo apt-get install libgit2-dev
pip3 install setuptools
bash tools/ci/install_node.sh
bash tools/ci/install_spaceman_dmm.sh dreamchecker
Expand All @@ -48,16 +53,16 @@ jobs:
compile_all_maps:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Compile Maps
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/BYOND
key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '^18'
- name: Compile All Maps
Expand All @@ -70,30 +75,30 @@ jobs:
auxmos:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Build Auxmos
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: 'Putnam3145/auxmos'
ref: '6be702ec36d8024bfb93b4277004a9a755f5e92e'
path: 'auxmos'

- name: Cache cargo registry
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cargo/registry
key: auxmos-registry-${{ hashFiles('auxmos/Cargo.lock') }}

- name: Cache cargo index
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cargo/git
key: auxmos-index-${{ hashFiles('auxmos/Cargo.lock') }}

- name: Cache cargo build
id: auxmos-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: auxmos/target
key: auxmos-build-target-${{ hashFiles('auxmos/Cargo.lock') }}
Expand All @@ -105,13 +110,11 @@ jobs:
sudo apt-get update
sudo apt install build-essential g++-multilib libc6-i386 libstdc++6:i386
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@stable
if: steps.auxmos-cache.outputs.cache-hit != 'true'
with:
profile: minimal
toolchain: ${{env.toolchain}}
target: ${{env.target}}
override: true

- name: Build
if: steps.auxmos-cache.outputs.cache-hit != 'true'
Expand All @@ -120,15 +123,15 @@ jobs:
ldd auxmos/target/${{env.target}}/release/libauxmos.so
- name: Upload libauxmos artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: libauxmos
path: auxmos/target/${{env.target}}/release/libauxmos.so

run_all_tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Integration Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
services:
mysql:
image: mysql:latest
Expand All @@ -138,14 +141,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') }}
Expand All @@ -161,14 +164,14 @@ jobs:
mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '^18'
- 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
sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386
bash tools/ci/install_rust_g.sh
- name: Install auxmos
run: |
Expand All @@ -182,7 +185,7 @@ jobs:
bash tools/ci/run_server.sh
- name: Upload screenshot tests
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test_artifacts_${{ matrix.map }}
path: data/screenshots_new/
Expand All @@ -192,7 +195,7 @@ jobs:
# if: "!contains(github.event.head_commit.message, '[ci skip]') && always()"
# needs: [run_all_tests]
# name: Compare Screenshot Tests
# runs-on: ubuntu-20.04
# runs-on: ubuntu-22.04
# steps:
# - uses: actions/checkout@v2
# # If we ever add more artifacts, this is going to break, but it'll be obvious.
Expand All @@ -218,7 +221,7 @@ jobs:
# echo ${{ github.event.pull_request.number }} > artifacts/screenshot_comparisons/pull_request_number.txt
# - name: Upload bad screenshots
# if: failure()
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: bad-screenshots
# path: artifacts/screenshot_comparisons
Expand All @@ -228,9 +231,9 @@ jobs:
name: Windows Build
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '^18'
- name: Compile
Expand All @@ -242,7 +245,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
6 changes: 3 additions & 3 deletions .github/workflows/compile_changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
compile:
name: "Compile changelogs"
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: "Check for ACTION_ENABLER secret and pass true to output if it exists to be checked by later steps"
id: value_holder
Expand All @@ -20,7 +20,7 @@ jobs:
echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: "Setup python"
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: "Install deps"
Expand All @@ -31,7 +31,7 @@ jobs:
sudo apt-get install dos2unix
- name: "Checkout"
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 25
- name: "Compile"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conflicts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- master
jobs:
triage:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: mschilde/auto-label-merge-conflicts@2e8fcc76c6430272ec8bb64fb74ec1592156aa6a
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
jobs:
publish:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build and Publish Docker Image to Registry
uses: elgohr/Publish-Docker-Github-Action@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_emoji.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:

jobs:
title_and_changelog:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: Wayland-Smithy/emoji-stripper-action@8f4c2fe9748bb9b02f105be4e72a1a42b0f34d84
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/show_screenshot_test_results.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
show_screenshot_test_results:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: Show Screenshot Test Results
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: "Check for ARTIFACTS_FILE_HOUSE_KEY"
id: secrets_set
Expand All @@ -25,7 +25,7 @@ jobs:
echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: Checkout
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Prepare module
if: steps.secrets_set.outputs.SECRETS_ENABLED
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
npm install node-fetch
- name: Show screenshot test results
if: steps.secrets_set.outputs.SECRETS_ENABLED
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
FILE_HOUSE_KEY: ${{ secrets.ARTIFACTS_FILE_HOUSE_KEY }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v1
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-pr-message: "This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update_tgs_dmapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:

jobs:
update-dmapi:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Update the TGS DMAPI
steps:
- name: Clone
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Branch
run: |
Expand Down
2 changes: 1 addition & 1 deletion dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export BYOND_MAJOR=515
export BYOND_MINOR=1633

#rust_g git tag
export RUST_G_VERSION=1.0.1
export RUST_G_VERSION=2.2.0

#node version
export NODE_VERSION=18
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/check_changelogs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
set -euo pipefail

md5sum -c - <<< "4d783933c74290b3a219068790b2046f *html/changelogs/example.yml"
python3 tools/cl/ss13_genchangelog.py html/changelogs
tools/bootstrap/python tools/cl/ss13_genchangelog.py html/changelogs
4 changes: 2 additions & 2 deletions tools/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pygit2==1.0.1
pygit2==1.15.1
bidict==0.13.1
Pillow==10.3.0

# changelogs
PyYaml==5.4
PyYaml==6.0.2
beautifulsoup4==4.9.3

0 comments on commit 34d9ae7

Please sign in to comment.