cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 03:49:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

CI Work (#20419)

Browse Source 
Updated runners to ubuntu 2024.04 LTS

Consolidated some node cache utilization in its own action

Updated merge conflict detector action version

PRs with merge conflicts now get the Review Required tag removed, and
PRs that had a conflict get a comment remembering the author to mark
them as ready to review if they are ready once the conflict is resolved
This commit is contained in:
Fluffy
2025-02-16 00:25:52 +01:00
committed by GitHub
parent 3c7a028366
commit b512bcdbf0
5 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/byond.yml
+13 -23
View File
@@ -46,7 +46,7 @@ jobs:
###########################################
validate-structure:
name: Validate Structure
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) }}
concurrency:
@@ -77,7 +77,7 @@ jobs:
###########################################
megalinter:
name: Validate EditorConfig Compliance
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) }}
concurrency:
@@ -130,7 +130,7 @@ jobs:
###########################################
lint-spacemandmm:
name: Lint SpacemanDMM
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) }}
needs: validate-structure
@@ -177,7 +177,7 @@ jobs:
###########################################
lint-opendream:
name: Lint OpenDream
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) }}
needs: validate-structure
@@ -218,7 +218,7 @@ jobs:
###########################################
lint-tgui:
name: Lint TGUI
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) }}
needs: validate-structure
@@ -236,23 +236,13 @@ jobs:
- name: Set ENV variables
run: bash dependencies.sh
#Restore YARN (Node packages) cache
- name: Restore Yarn cache
uses: actions/cache@v4
with:
path: tgui/.yarn/cache
key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-
${{ runner.os }}-
#Setup NodeJS using YARN as cache
- name: Setup Node
uses: actions/setup-node@v3
with:
cache-dependency-path: tgui/yarn.lock
node-version: ${{ env.NODE_VERSION_LTS }}
cache: 'yarn'
cache-dependency-path: tgui/yarn.lock
#Lint TGUI
- name: Check Tgui
@@ -265,7 +255,7 @@ jobs:
###########################################
lint-misc:
name: Lint Misc
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) }}
needs: validate-structure
@@ -322,7 +312,7 @@ jobs:
###########################################
generic-tests:
name: Generic Tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) && !(contains(github.event.head_commit.message, '[ut skip]'))}}
needs: [validate-structure, lint-spacemandmm, lint-opendream, lint-tgui, lint-misc]
@@ -445,7 +435,7 @@ jobs:
###########################################
create-and-destroy:
name: Create and Destroy Test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) && !(contains(github.event.head_commit.message, '[ut skip]'))}}
needs: [validate-structure, lint-spacemandmm, lint-opendream, lint-tgui, lint-misc]
@@ -570,7 +560,7 @@ jobs:
###########################################
map-tests:
name: Run Map Tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) && !(contains(github.event.head_commit.message, '[ut skip]'))}}
needs: [validate-structure, lint-spacemandmm, lint-opendream, lint-tgui, lint-misc]
@@ -695,7 +685,7 @@ jobs:
###########################################
exoplanet_testing:
name: Run Exoplanet Tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) && !(contains(github.event.head_commit.message, '[ut skip]'))}}
needs: [validate-structure, lint-spacemandmm, lint-opendream, lint-tgui, lint-misc]
@@ -819,7 +809,7 @@ jobs:
###########################################
away-sites-tests:
name: Run Map Tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) && !(contains(github.event.head_commit.message, '[ut skip]'))}}
needs: [validate-structure, lint-spacemandmm, lint-opendream, lint-tgui, lint-misc]
@@ -942,7 +932,7 @@ jobs:
###########################################
ruins-tests:
name: Run Ruins Tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ !(contains(github.event.head_commit.message, '[ci skip]')) && !(contains(github.event.head_commit.message, '[ut skip]'))}}
needs: [validate-structure, lint-spacemandmm, lint-opendream, lint-tgui, lint-misc]
.github/workflows/maintenance.yml
+3 -1
View File
@@ -14,8 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: check if prs are dirty
uses: eps1lon/actions-label-merge-conflict@releases/2.x
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "Merge Conflict"
removeOnDirtyLabel: "Review Required"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
commentOnClean: "Conflicts have been resolved. Mark the PR as ready for review again if it is ready to be reviewed."
.github/workflows/update_changelog.yml
+1 -1
View File
@@ -7,7 +7,7 @@ on:
jobs:
compile:
name: "Compile changelogs"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: "Check for BOT_TOKEN_AURORA secret and pass true to output if it exists to be checked by later steps"
id: value_holder
.github/workflows/update_tgs_dmapi.yml
+1 -1
View File
@@ -7,7 +7,7 @@ on:
jobs:
update-dmapi:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
name: Update the TGS DMAPI
steps:
- name: Clone
.github/workflows/update_tgui.yml
+3 -10
View File
@@ -5,27 +5,20 @@ on:
jobs:
update-tgui:
concurrency: tgui
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 14
cache: 'yarn'
cache-dependency-path: tgui/yarn.lock
- name: Checkout Repository
uses: actions/checkout@v4
with:
token: ${{ secrets.BOT_TOKEN_AURORA }}
- name: Restore Yarn cache
uses: actions/cache@v4
with:
path: tgui/.yarn/cache
key: ${{ runner.os }}-yarn-${{ hashFiles('tgui/yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-
${{ runner.os }}-
- name: Update TGUI
run: |
tools/bootstrap/node tools/build/build.js tgui