From 35ef280b5586264a1c9f6cdaec836d2e9945d60f Mon Sep 17 00:00:00 2001 From: flip1995 Date: Thu, 23 Apr 2020 20:44:18 +0200 Subject: [PATCH 1/2] Always use the deploy script and templates of the master branch --- .github/workflows/deploy.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 10033daf0aed..f542f9b02c17 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,6 +38,12 @@ jobs: - name: Set beta to true if: github.ref == 'refs/heads/beta' run: echo "::set-env name=BETA::true" + + - name: Use scripts and templates from master branch + run: | + git fetch --no-tags --prune --depth=1 origin master + git checkout origin/master -- .github/deploy.sh util/gh-pages/ util/*.py + - name: Deploy run: | eval "$(ssh-agent -s)" From 0476e8b48380f0376ff040f07edfe74372ae2101 Mon Sep 17 00:00:00 2001 From: flip1995 Date: Thu, 23 Apr 2020 20:45:39 +0200 Subject: [PATCH 2/2] Remove apt-get upgrade again --- .github/workflows/clippy_bors.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index 4429a7c1e5c5..6675a1029bbc 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -77,8 +77,6 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt-get update - # perform system upgrade to work around /~https://github.com/rust-lang/rust-clippy/issues/5477 , revert as soon as that is fixed - sudo apt-get -y upgrade sudo apt-get install gcc-multilib libssl-dev:i386 libgit2-dev:i386 if: matrix.host == 'i686-unknown-linux-gnu'