diff --git a/.github/workflows/byond.yml b/.github/workflows/byond.yml index 2fc304bcebd..071e65e872e 100644 --- a/.github/workflows/byond.yml +++ b/.github/workflows/byond.yml @@ -35,6 +35,10 @@ env: #The maximum number of retries the unit tests (excluding linters) can make, if appropriate for them to CI_MAX_RETRIES: 3 +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: ########################################### @@ -112,7 +116,7 @@ jobs: # Upload MegaLinter artifacts - name: Upload Megalinter Artifacts if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: MegaLinter reports path: | @@ -146,7 +150,7 @@ jobs: #Restores SpacemanDMM from the cache repository - name: Restore SpacemanDMM cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/SpacemanDMM key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }} @@ -224,7 +228,7 @@ jobs: #Restore YARN (Node packages) cache - name: Restore Yarn cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: tgui/.yarn/cache key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }} @@ -354,13 +358,13 @@ jobs: #Restores BYOND cache - name: Restore BYOND cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/BYOND/* key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }} - name: Restore FlyWay cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/flyway key: ${{ runner.os }}-flyway-${{ env.FLYWAY_BUILD }} @@ -419,7 +423,7 @@ jobs: (! grep "runtime error:" log.txt) - name: Upload Condensed UT Log - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() || ${{ runner.debug }} with: name: condensed-${{ matrix.map }}-${{ matrix.pod }}.log @@ -477,13 +481,13 @@ jobs: #Restores BYOND cache - name: Restore BYOND cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/BYOND/* key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }} - name: Restore FlyWay cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/flyway key: ${{ runner.os }}-flyway-${{ env.FLYWAY_BUILD }} @@ -542,7 +546,7 @@ jobs: (! grep "runtime error:" log.txt) - name: Upload Condensed UT Log - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() || ${{ runner.debug }} with: name: condensed-${{ matrix.map }}-${{ matrix.pod }}.log @@ -602,13 +606,13 @@ jobs: #Restores BYOND cache - name: Restore BYOND cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/BYOND/* key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }} - name: Restore FlyWay cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/flyway key: ${{ runner.os }}-flyway-${{ env.FLYWAY_BUILD }} @@ -667,7 +671,7 @@ jobs: (! grep "runtime error:" log.txt) - name: Upload Condensed UT Log - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() || ${{ runner.debug }} with: name: condensed-${{ matrix.map }}-${{ matrix.pod }}.log @@ -727,13 +731,13 @@ jobs: #Restores BYOND cache - name: Restore BYOND cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/BYOND/* key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }} - name: Restore FlyWay cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/flyway key: ${{ runner.os }}-flyway-${{ env.FLYWAY_BUILD }} @@ -792,7 +796,7 @@ jobs: (! grep "runtime error:" log.txt) - name: Upload Condensed UT Log - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() || ${{ runner.debug }} with: name: condensed-${{ matrix.map }}-${{ matrix.pod }}.log @@ -851,13 +855,13 @@ jobs: #Restores BYOND cache - name: Restore BYOND cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/BYOND/* key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }} - name: Restore FlyWay cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/flyway key: ${{ runner.os }}-flyway-${{ env.FLYWAY_BUILD }} @@ -916,7 +920,7 @@ jobs: (! grep "runtime error:" log.txt) - name: Upload Condensed UT Log - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() || ${{ runner.debug }} with: name: condensed-${{ matrix.map }}-${{ matrix.pod }}.log @@ -974,13 +978,13 @@ jobs: #Restores BYOND cache - name: Restore BYOND cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/BYOND/* key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }} - name: Restore FlyWay cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/flyway key: ${{ runner.os }}-flyway-${{ env.FLYWAY_BUILD }} @@ -1039,7 +1043,7 @@ jobs: (! grep "runtime error:" log.txt) - name: Upload Condensed UT Log - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() || ${{ runner.debug }} with: name: condensed-${{ matrix.map }}-${{ matrix.pod }}.log diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml index 7327aef5373..07ff662f793 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@v3 + uses: actions/checkout@v4 - name: Branch run: | diff --git a/.github/workflows/update_tgui.yml b/.github/workflows/update_tgui.yml index 2b82d4d318a..558be200dce 100644 --- a/.github/workflows/update_tgui.yml +++ b/.github/workflows/update_tgui.yml @@ -13,12 +13,12 @@ jobs: node-version: 14 - name: Checkout Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.BOT_TOKEN_AURORA }} - name: Restore Yarn cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: tgui/.yarn/cache key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }} diff --git a/html/changelogs/fluffyghost-updateciactions.yml b/html/changelogs/fluffyghost-updateciactions.yml new file mode 100644 index 00000000000..a8ff3f45ddc --- /dev/null +++ b/html/changelogs/fluffyghost-updateciactions.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - server: "Updated CI actions to the latest version." + - server: "Set concurrency level to the workflow level for faster canceling on re-runs (hopefully)."