From a06485062dee254f4448774de1d4f8e52c1d59ac Mon Sep 17 00:00:00 2001 From: Enno Ruijters Date: Mon, 19 Feb 2024 20:44:33 +0100 Subject: [PATCH 1/4] Bump Ubuntu to 22.04 in Github workflow --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ec8917..47904d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 @@ -14,7 +14,7 @@ jobs: - name: Ready dependencies run: | curl https://www.ennoruijters.nl/package.gpg | sudo apt-key add - - echo "deb http://packages.ennoruijters.nl focal main" | sudo tee -a /etc/apt/sources.list + echo "deb http://packages.ennoruijters.nl jammy main" | sudo tee -a /etc/apt/sources.list sudo apt update sudo apt-cache show storm | grep Version | sed -e 's/Version: /STORM_VERSION=/' >> $GITHUB_ENV sudo mkdir apt-archive From cff64b26e096ad1abf5265a17c3ad01699674cdc Mon Sep 17 00:00:00 2001 From: Enno Ruijters Date: Mon, 19 Feb 2024 21:46:34 +0100 Subject: [PATCH 2/4] Bump github action versions --- .github/workflows/mac.yml | 12 ++++++------ .github/workflows/main.yml | 14 +++++++------- .github/workflows/windows.yml | 18 +++++++++--------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 307f516..2f3f963 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -6,8 +6,8 @@ jobs: build: runs-on: macos-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin @@ -25,7 +25,7 @@ jobs: - name: Compile DFTCalc run: cd build && make -j$NUMCORES install - name: Checkout DFTRES - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: utwente-fmt/DFTRES path: DFTRES @@ -36,7 +36,7 @@ jobs: echo "imrmc=$(git ls-remote git://git.ennoruijters.nl/imrmc.git | grep '\srefs/heads/master$' | grep -o '^[0-9a-z]\+')" >> $GITHUB_OUTPUT - name: Cache DFTRES id: cache-dftres - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: DFTRES/DFTRES.jar key: ${{ runner.os }}-dftres-${{ steps.cache-revs.outputs.dftres }} @@ -45,7 +45,7 @@ jobs: run: cd DFTRES && make jar - name: Cache IMRMC id: cache-imrmc - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: imrmc/bin/imrmc key: ${{ runner.os }}-imrmc-${{ steps.cache-revs.outputs.imrmc }} @@ -60,7 +60,7 @@ jobs: DFTRES: ${{github.workspace}}/DFTRES run: cd test && bash test.sh --exact --imrmc - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: test-results diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 47904d6..d3f99dd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,8 +6,8 @@ jobs: build: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin @@ -19,7 +19,7 @@ jobs: sudo apt-cache show storm | grep Version | sed -e 's/Version: /STORM_VERSION=/' >> $GITHUB_ENV sudo mkdir apt-archive - name: APT cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: apt-archive.tar key: ${{ runner.os }}-apt-${{ env.STORM_VERSION }} @@ -33,7 +33,7 @@ jobs: - name: Compile DFTCalc run: cd build && make -j4 install - name: Checkout DFTRES - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: utwente-fmt/DFTRES path: DFTRES @@ -49,7 +49,7 @@ jobs: echo "imrmc-march=$(gcc -march=native -E -v - &1 | grep cc1 | sha256sum | grep -o '^[0-9a-z]\+')" >> $GITHUB_OUTPUT - name: Cache DFTRES id: cache-dftres - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: DFTRES/DFTRES.jar key: ${{ runner.os }}-dftres-${{ steps.cache-revs.outputs.dftres }} @@ -58,7 +58,7 @@ jobs: run: cd DFTRES && make jar - name: Cache IMRMC id: cache-imrmc - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: imrmc/bin/imrmc key: ${{ runner.os }}-imrmc-${{ steps.cache-revs.outputs.imrmc }}-${{ steps.cache-revs.outputs.imrmc-march }} @@ -73,7 +73,7 @@ jobs: DFTRES: ${{github.workspace}}/DFTRES run: cd test && bash test.sh --exact --imrmc && bash test.sh --exact --storm && bash test.sh --storm - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: test-results diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 56ce634..5241840 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,20 +6,20 @@ jobs: build: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: dftcalc - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: 17 distribution: microsoft - name: Checkout yaml-cpp - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: jbeder/yaml-cpp path: yaml-cpp - name: Checkout DFTRES - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: utwente-fmt/DFTRES path: DFTRES @@ -33,7 +33,7 @@ jobs: echo "IMRMC_REV=$REV" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Try to load yaml-cpp id: cache-yaml-cpp - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | yaml-cpp/yaml-cpp.dll @@ -50,7 +50,7 @@ jobs: copy yaml-cpp.dll,yaml-cpp.lib .. - name: Cache DFTRES id: cache-dftres - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: DFTRES\DFTRES.jar key: ${{ runner.os }}-DFTRES-${{ env.DFTRES_REV }} @@ -68,7 +68,7 @@ jobs: java -jar DFTRES.jar --version - name: Try to load win-flex and win-bison id: cache-flex - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: win_flex_bison-2.5.23.zip key: ${{ runner.os }}-flex-2.5.53 @@ -83,7 +83,7 @@ jobs: "$Env:GITHUB_WORKSPACE\flex_bison" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Cache IMRMC id: cache-imrmc - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: imrmc\imrmc.exe key: ${{ runner.os }}-imrmc-${{ env.IMRMC_REV }} @@ -115,7 +115,7 @@ jobs: cd dftcalc\test .\test.ps1 --imrmc - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: dftcalc From 6a94d67eaa2d6a9da20ff7239a687b742141000b Mon Sep 17 00:00:00 2001 From: Enno Ruijters Date: Mon, 19 Feb 2024 21:43:27 +0100 Subject: [PATCH 3/4] Fix Github workflow for Windows --- .github/workflows/windows.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5241840..29ef013 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,12 +42,11 @@ jobs: - name: Compile yaml-cpp if not cached if: steps.cache-yaml-cpp.outputs.cache-hit != 'true' run: | - & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" - mkdir yaml-cpp/build | Out-Null - cd yaml-cpp/build - cmake -G Ninja -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DYAML_BUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release .. - ninja yaml-cpp.dll - copy yaml-cpp.dll,yaml-cpp.lib .. + cd yaml-cpp + cmake -B build -DYAML_BUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release + cmake --build build --parallel --verbose --config Release + copy build\Release\yaml-cpp.dll . + copy build\Release\yaml-cpp.lib . - name: Cache DFTRES id: cache-dftres uses: actions/cache@v4 @@ -93,16 +92,15 @@ jobs: - name: Compile IMRMC if: steps.cache-imrmc.outputs.cache-hit != 'true' run: | - & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" + & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -SkipAutomaticLocation cd imrmc nmake /F makefile.win imrmc.exe - name: Build DFTCalc run: | - & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" - mkdir dftcalc\build | Out-Null - cd dftcalc\build - cmake -G Ninja -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_PREFIX_PATH="$Env:GITHUB_WORKSPACE\yaml-cpp" -DCMAKE_INCLUDE_PATH="$Env:GITHUB_WORKSPACE\yaml-cpp" -DDFTROOT="$Env:GITHUB_WORKSPACE\dftcalc" .. - ninja + cd dftcalc + cmake -B build -DCMAKE_PREFIX_PATH="$Env:GITHUB_WORKSPACE\yaml-cpp" -DCMAKE_INCLUDE_PATH="$Env:GITHUB_WORKSPACE\yaml-cpp" -DDFTROOT="$Env:GITHUB_WORKSPACE\dftcalc" + cmake --build build --parallel --verbose --config Release + cmake --install build --verbose --config Release - name: Set PATH run: | "$Env:GITHUB_WORKSPACE\imrmc" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append From e1be18b2697c94cb846426368d68a4e703be7f57 Mon Sep 17 00:00:00 2001 From: Enno Ruijters Date: Thu, 7 Nov 2024 23:03:28 +0100 Subject: [PATCH 4/4] Set Mac build to MacOS 13 for now --- .github/workflows/mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 2f3f963..5b9a517 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4