From f774d448bb9937966e8759977715f2cd492b128d Mon Sep 17 00:00:00 2001 From: Fabian Zickgraf Date: Wed, 7 Oct 2020 18:36:23 +0200 Subject: [PATCH] Test release --- .github/workflows/Tests.yml | 11 +++++++++++ PackageInfo.g | 2 +- make_dist.sh | 6 ++---- release-gap-package | 0 4 files changed, 14 insertions(+), 5 deletions(-) mode change 100644 => 100755 release-gap-package diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index 4de42239..af02869f 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -37,3 +37,14 @@ jobs: TERM=dumb make -C FinSetsForCAP -j $(nproc) --output-sync ci-test cp ./FinSetsForCAP/.codecov.yml ./ curl -s https://codecov.io/bash | bash + git config --global user.name "Bot" + git config --global user.email "empty" + cd FinSetsForCAP + CUR_SHA=$(git rev-parse --verify HEAD) + git worktree add gh-pages/ gh-pages || (echo "There was an error. Make sure there is a branch named 'gh-pages'. See https://github.com/homalg-project/PackageJanitor#error-there-was-an-error-make-sure-there-is-a-branch-named-gh-pages"; exit 1) + if [ "${{ matrix.image }}" = "gapsystem/gap-docker" ] && [ "$CUR_SHA" = "$(git rev-parse origin/master)" ] && [ $(dirname "$GITHUB_REPOSITORY") = "homalg-project" ]; then \ + git checkout master; \ + ./make_dist.sh --token "${{ secrets.GITHUB_TOKEN }}"; \ + else \ + echo "Not making a release."; \ + fi diff --git a/PackageInfo.g b/PackageInfo.g index d1cac4e2..3480f966 100644 --- a/PackageInfo.g +++ b/PackageInfo.g @@ -15,7 +15,7 @@ Version := Maximum( [ ## this line prevents merge conflicts "2017.05.26", ## Julia's version ## this line prevents merge conflicts - "2020.01.20", ## Fabian's version + "2020.10.01", ## Fabian's version ## this line prevents merge conflicts "2018.08.31", ## Mario's version ## this line prevents merge conflicts diff --git a/make_dist.sh b/make_dist.sh index f932c4d5..69d90812 100755 --- a/make_dist.sh +++ b/make_dist.sh @@ -1,5 +1,3 @@ -#/bin/bash +#!/bin/bash -base_dir="$PWD" - -./release-gap-package --srcdir ${base_dir} --webdir ${base_dir}/gh-pages --update-file ${base_dir}/gh-pages/update.g $@ +./release-gap-package $@ diff --git a/release-gap-package b/release-gap-package old mode 100644 new mode 100755