From 3eb7c8201bbabac6a61535ed2e3ca3ac5053634a Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Wed, 8 Apr 2020 18:43:51 -0400 Subject: [PATCH 1/4] Combine artifacts in turdis --- .github/workflows/turdis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/turdis.yml b/.github/workflows/turdis.yml index 49c2bad3f267..3af483579b67 100644 --- a/.github/workflows/turdis.yml +++ b/.github/workflows/turdis.yml @@ -140,16 +140,16 @@ jobs: run: | tools/travis/dm.sh -DTRAVISBUILDING yogstation.dme || travis_terminate 1 tools/travis/run_server.sh - - - name: Upload DMB - uses: actions/upload-artifact@v1 - with: - name: DMB - path: ${{ github.workspace }}/yogstation.dmb - - name: Upload RSC + - name: Prepare artifacts + run: | + mkdir ~/artifacts + cp yogstation.dme ~/artifacts + cp yogstation.rsc ~/artifacts + + - name: Upload DMB + RSC uses: actions/upload-artifact@v1 with: - name: RSC - path: ${{ github.workspace }}/yogstation.rsc + name: DMB + RSC + path: ~/yogstation.dmb From 6258f915f0a0a5e4211348cbe40587e9c79646bb Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Wed, 8 Apr 2020 18:57:11 -0400 Subject: [PATCH 2/4] Update turdis.yml --- .github/workflows/turdis.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/turdis.yml b/.github/workflows/turdis.yml index 3af483579b67..168f8c6aa80a 100644 --- a/.github/workflows/turdis.yml +++ b/.github/workflows/turdis.yml @@ -53,7 +53,7 @@ jobs: tools/travis/build_tgui.sh tools/travis/check_grep.sh - - name: Run linter + - name: Run Linter run: ~/dreamchecker compile: name: Compile All Maps @@ -61,7 +61,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Install dependencies + - name: Install Dependencies run: | curl https://repogen.simplylinux.ch/txt/bionic/sources_3a64d21a7855de8236118d7d04a3c5fef63083fb.txt | sudo tee /etc/apt/sources.list sudo dpkg --add-architecture i386 @@ -103,13 +103,14 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Install dependencies + - name: Install Dependencies run: | curl https://repogen.simplylinux.ch/txt/bionic/sources_3a64d21a7855de8236118d7d04a3c5fef63083fb.txt | sudo tee /etc/apt/sources.list sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa sudo dpkg --add-architecture i386 sudo apt-get update sudo apt install libstdc++6:i386 gcc-multilib g++-7 g++-7-multilib libmariadb-client-lgpl-dev:i386 libmariadbd-dev + - name: Cache BYOND uses: actions/cache@v1 with: @@ -117,7 +118,7 @@ jobs: key: ${{ runner.os }}-byond-${{ hashFiles('Dockerfile')}} restore-keys: ${{ runner.os }}-byond - - name: Setup environment + - name: Setup Environment run: | tools/travis/install_byond.sh echo "::set-env name=BYOND_SYSTEM::/home/runner/BYOND/byond" @@ -127,29 +128,29 @@ jobs: cd $GITHUB_WORKSPACE tools/travis/install_libmariadb.sh tools/travis/install_rust_g.sh - - - name: Setup Database - run: | mysql -u root -h 127.0.0.1 -e 'CREATE DATABASE tg_travis;' mysql -u root -h 127.0.0.1 tg_travis < SQL/tgstation_schema.sql mysql -u root -h 127.0.0.1 -e 'CREATE DATABASE tg_travis_prefixed;' mysql -u root -h 127.0.0.1 tg_travis_prefixed < SQL/tgstation_schema_prefixed.sql tools/travis/build_bsql.sh - - name: Compile and run tests + - name: Compile run: | tools/travis/dm.sh -DTRAVISBUILDING yogstation.dme || travis_terminate 1 - tools/travis/run_server.sh - - name: Prepare artifacts + - name: Prepare Artifacts run: | mkdir ~/artifacts cp yogstation.dme ~/artifacts cp yogstation.rsc ~/artifacts - - name: Upload DMB + RSC + - name: Upload Artifacts uses: actions/upload-artifact@v1 with: name: DMB + RSC - path: ~/yogstation.dmb + path: ~/artifacts + + - name: Run Tests + run: | + tools/travis/run_server.sh From b08ef3276c8ae7c93b96b45352b3e6431385230e Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Wed, 8 Apr 2020 20:05:49 -0400 Subject: [PATCH 3/4] test? --- .github/workflows/turdis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/turdis.yml b/.github/workflows/turdis.yml index 168f8c6aa80a..159280550c88 100644 --- a/.github/workflows/turdis.yml +++ b/.github/workflows/turdis.yml @@ -134,6 +134,10 @@ jobs: mysql -u root -h 127.0.0.1 tg_travis_prefixed < SQL/tgstation_schema_prefixed.sql tools/travis/build_bsql.sh + - name: Test + run: | + echo ${{env.HOME}} + - name: Compile run: | tools/travis/dm.sh -DTRAVISBUILDING yogstation.dme || travis_terminate 1 @@ -148,7 +152,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: DMB + RSC - path: ~/artifacts + path: ${{env.HOME}}/artifacts - name: Run Tests run: | From 60f7f927e43f63e1339d1470f1ced019c7facb64 Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Wed, 8 Apr 2020 20:11:59 -0400 Subject: [PATCH 4/4] Update turdis.yml --- .github/workflows/turdis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/turdis.yml b/.github/workflows/turdis.yml index 159280550c88..29e3b5c386c8 100644 --- a/.github/workflows/turdis.yml +++ b/.github/workflows/turdis.yml @@ -134,25 +134,21 @@ jobs: mysql -u root -h 127.0.0.1 tg_travis_prefixed < SQL/tgstation_schema_prefixed.sql tools/travis/build_bsql.sh - - name: Test - run: | - echo ${{env.HOME}} - - name: Compile run: | tools/travis/dm.sh -DTRAVISBUILDING yogstation.dme || travis_terminate 1 - name: Prepare Artifacts run: | - mkdir ~/artifacts - cp yogstation.dme ~/artifacts - cp yogstation.rsc ~/artifacts + mkdir artifacts + cp yogstation.dme artifacts + cp yogstation.rsc artifacts - name: Upload Artifacts uses: actions/upload-artifact@v1 with: name: DMB + RSC - path: ${{env.HOME}}/artifacts + path: ${{github.workspace}}/artifacts - name: Run Tests run: |