diff --git a/.github/workflows/alt_linux_distros.yml b/.github/workflows/alt_linux_distros.yml index 31606d47..5583b235 100644 --- a/.github/workflows/alt_linux_distros.yml +++ b/.github/workflows/alt_linux_distros.yml @@ -12,7 +12,6 @@ jobs: matrix: cfg: #-------- Operating Systems ---------------- - - { os: ubuntu, tag: 18.04, arch: debian, arch_ver: 10 } - { os: ubuntu, tag: 20.04, arch: debian, arch_ver: 11 } - { os: debian, tag: 10, arch: debian, arch_ver: 10 } - { os: debian, tag: 11, arch: debian, arch_ver: 11 } @@ -142,7 +141,7 @@ jobs: - name: Install GTest run: ${{matrix.install_gtest}} - name: Checkout repository - uses: actions/checkout@master + uses: actions/checkout@v3 - name: Configure Trick run: | export MAKEFLAGS=-j`nproc` @@ -156,23 +155,4 @@ jobs: run: | cd share/trick/trickops/ python3 -m venv .venv && . .venv/bin/activate && pip3 install -r requirements.txt - cd ../../../; make test - - name: Upload Tests - uses: actions/upload-artifact@v3.0.0 - if: success() || failure() # run this step even if previous step failed - with: - name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} - path: trick_test/*.xml - retention-days: 1 -# Uncomment for build artifacts -# - name: Upload Trick Build -# uses: actions/upload-artifact@v3.0.0 -# with: -# name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} -# path: | -# bin -# include -# lib -# share -# libexec -# retention-days: 1 + cd ../../../; make test32 \ No newline at end of file diff --git a/.github/workflows/test_32.yml b/.github/workflows/test_32.yml index 723a5441..d96b7cfb 100644 --- a/.github/workflows/test_32.yml +++ b/.github/workflows/test_32.yml @@ -10,8 +10,6 @@ jobs: runs-on: ubuntu-latest container: docker://centos:7 steps: - - name: Checkout repository - uses: actions/checkout@master - name: Add yum repo run: yum -y install epel-release.noarch && yum -y update - name: Install dependency group @@ -53,6 +51,8 @@ jobs: cmake . make make install + - name: Checkout repository + uses: actions/checkout@v3 - name: Build Trick run: | yum -y update && yum clean all diff --git a/.github/workflows/test_32_oracle.yml b/.github/workflows/test_32_oracle.yml index 0d8f3f10..c0850e09 100644 --- a/.github/workflows/test_32_oracle.yml +++ b/.github/workflows/test_32_oracle.yml @@ -56,12 +56,13 @@ jobs: make make install - name: Checkout repository - uses: actions/checkout@master + uses: actions/checkout@v3 - name: Build Trick run: | export CFLAGS="-m32" export CXXFLAGS="-m32" export MAKEFLAGS=-j`nproc` + export JAVA_HOME=$(dirname $(dirname $(readlink -f `which java`))) ./configure --without-hdf5 --enable-32bit make - name: Run tests diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index 9ef15500..32efe27e 100644 --- a/.github/workflows/test_linux.yml +++ b/.github/workflows/test_linux.yml @@ -139,7 +139,7 @@ jobs: - name: Install GTest run: ${{matrix.install_gtest}} - name: Checkout repository - uses: actions/checkout@master + uses: actions/checkout@v3 - name: Configure Trick run: | export MAKEFLAGS=-j`nproc`