From 9a2107bf1aa09bc8bc956e689e58e65bf590374a Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sun, 9 Feb 2020 00:48:14 +0100 Subject: [PATCH 1/2] This one too. --- tgui-next/bin/tgui | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tgui-next/bin/tgui diff --git a/tgui-next/bin/tgui b/tgui-next/bin/tgui old mode 100644 new mode 100755 From 6152ac92350434f0ee0b0f4f0e2c4a984a6db918 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sun, 9 Feb 2020 00:56:31 +0100 Subject: [PATCH 2/2] tgstation PR #48090 --- .github/workflows/autobuild_tgui.yml | 9 +++------ tools/travis/build_tgui.sh | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/autobuild_tgui.yml b/.github/workflows/autobuild_tgui.yml index 565cc8fd57..6849941d10 100644 --- a/.github/workflows/autobuild_tgui.yml +++ b/.github/workflows/autobuild_tgui.yml @@ -18,18 +18,15 @@ jobs: - name: Setup Node uses: actions/setup-node@v1 with: - node-version: '>=12.13' - - name: Get Dependencies - run: yarn install - working-directory: ./tgui-next + node-version: '>=12.13' - name: Build TGUI - run: yarn run build + run: bin/tgui --ci working-directory: ./tgui-next - name: Commit Artifacts run: | git config --local user.email "action@github.com" git config --local user.name "TGUI" - git commit -m "Automatic TGUI Rebuild [ci skip]" -a + git commit -m "Automatic TGUI Rebuild [ci skip]" -a || true - name: Push Artifacts uses: ad-m/github-push-action@master with: diff --git a/tools/travis/build_tgui.sh b/tools/travis/build_tgui.sh index 333e7331b0..b3973468e1 100755 --- a/tools/travis/build_tgui.sh +++ b/tools/travis/build_tgui.sh @@ -21,5 +21,4 @@ node node_modules/gulp/bin/gulp.js --min echo "Building 'tgui-next'" cd "${base_dir}/tgui-next" -bin/tgui --clean -bin/tgui +bin/tgui --ci