diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-14 09:31:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-14 09:31:57 (GMT) |
| commit | 7bbd536cdea0e0d4bcdef049f8bc2ff964fa3445 (patch) | |
| tree | 1064d185d741ebb0ee0ce785d82fe3aa648a7a20 /.github | |
| parent | 21e5079881531ebceefe721e59d840825dcbaa62 (diff) | |
| download | tk-7bbd536cdea0e0d4bcdef049f8bc2ff964fa3445.zip tk-7bbd536cdea0e0d4bcdef049f8bc2ff964fa3445.tar.gz tk-7bbd536cdea0e0d4bcdef049f8bc2ff964fa3445.tar.bz2 | |
Backport some "github actions" improvements from 8.6
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux-build.yml | 16 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 17 |
2 files changed, 19 insertions, 14 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index adb8d43..f9178e4 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -38,7 +38,6 @@ jobs: sudo apt-get install tcl8.5-dev libxss-dev mkdir "$HOME/install" touch tk/doc/man.macros tk/generic/tkStubInit.c - echo "TEST_INSTALL_DIR=$HOME/install" >> $GITHUB_ENV echo "CFGOPT=$CFGOPT --with-tcl=/usr/lib/tcl8.5" >> $GITHUB_ENV echo "CC=$COMPILER" >> $GITHUB_ENV echo "TOOL_DIR=$(cd tcl/tools;pwd)" >> $GITHUB_ENV @@ -50,7 +49,7 @@ jobs: OPTS: ${{ matrix.compiler }}-${{ matrix.symbols }}${{ matrix.disables }} - name: Configure (symbols=${{ matrix.symbols }} opts=${{ matrix.disables }}) run: | - ./configure $CFGOPT "--prefix=$TEST_INSTALL_DIR" || { + ./configure $CFGOPT "--prefix=$HOME/install" || { cat config.log echo "::error::Failure during Configure" exit 1 @@ -123,7 +122,6 @@ jobs: sudo apt-get install tcl8.5-dev libxss-dev xvfb mkdir "$HOME/install" touch tk/doc/man.macros tk/generic/tkStubInit.c - echo "TEST_INSTALL_DIR=$HOME/install" >> $GITHUB_ENV echo "CFGOPT=$CFGOPT --with-tcl=/usr/lib/tcl8.5" >> $GITHUB_ENV echo "CC=$COMPILER" >> $GITHUB_ENV working-directory: "." @@ -132,7 +130,7 @@ jobs: COMPILER: ${{ matrix.compiler }} - name: Configure (symbols=${{ matrix.symbols }}) run: | - ./configure $CFGOPT "--prefix=$TEST_INSTALL_DIR" || { + ./configure $CFGOPT "--prefix=$HOME/install" || { cat config.log echo "::error::Failure during Configure" exit 1 @@ -145,15 +143,13 @@ jobs: } - name: Run Tests run: | - xvfb-run --auto-servernum make test-classic | tee out-classic.txt || { + xvfb-run --auto-servernum make test-classic | tee out-classic.txt + xvfb-run --auto-servernum make test-ttk | tee out-ttk.txt + grep -q "Failed 0" out-classic.txt || { echo "::error::Failure during Test" exit 1 } - xvfb-run --auto-servernum make test-ttk | tee out-ttk.txt || { - echo "::error::Failure during Test" - exit 1 - } - cat out-classic.txt out-ttk.txt | grep -q "Failed 0" || { + grep -q "Failed 0" out-ttk.txt || { echo "::error::Failure during Test" exit 1 } diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 317bfc9..483d21b 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -60,7 +60,11 @@ jobs: echo "::error::Failure during Test" exit 1 } - cat out-classic.txt out-ttk.txt | grep -q "Failed [1-9]" && { + grep -q "Failed 0" out-classic.txt || { + echo "::error::Failure during Test" + exit 1 + } + grep -q "Failed 0" out-ttk.txt || { echo "::error::Failure during Test" exit 1 } @@ -141,8 +145,13 @@ jobs: } - name: Run Tests run: | - make test-classic | tee out-classic.txt || echo "::error::Failure during Test" - make test-ttk | tee out-ttk.txt || echo "::error::Failure during Test" - cat out-classic.txt out-ttk.txt | grep -q "Failed [1-9]" && { + make test-classic | tee out-classic.txt + make test-ttk | tee out-ttk.txt + grep -q "Failed 0" out-classic.txt || { echo "::error::Failure during Test" + exit 1 + } + grep -q "Failed 0" out-ttk.txt || { + echo "::error::Failure during Test" + exit 1 } |