From 92129c434612d239ca39ca59f443fe5fb215c208 Mon Sep 17 00:00:00 2001 From: Jost Migenda Date: Wed, 17 Apr 2024 18:38:44 +0100 Subject: [PATCH 1/5] Update actions/checkout to v4 Updates the action to Node 20, see https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/ --- .github/workflows/analysis.yml | 2 +- .github/workflows/build.yml | 6 +++--- .github/workflows/test.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 8e7a7488..6bc3b01b 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -19,7 +19,7 @@ jobs: sudo aqt install --outputdir /Qt 5.12.10 linux desktop -m qtcharts qtnetworkauth qtpurchasing qtdatavis3d qtscript qtvirtualkeyboard qtwebengine qtwebglplugin - name: Clone CemrgApp - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Code Analysis env: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82252bdb..de61c9cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,7 +96,7 @@ jobs: run: sudo find /MITK/ -exec touch -a -m -d 20210401 {} \; - name: Clone CemrgApp - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: CemrgApp @@ -170,7 +170,7 @@ jobs: # run: dir -R c:\MITK | foreach { $_.LastWriteTime = [DateTime]::ParseExact('01-04-21', 'dd-MM-yy', $null) } # # - name: Clone CemrgApp - # uses: actions/checkout@v2 + # uses: actions/checkout@v4 # with: # path: CemrgApp # @@ -263,7 +263,7 @@ jobs: run: find /Users/Shared/MITK/ -exec touch -a -m -t 202104010000 {} \; - name: Clone CemrgApp - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: CemrgApp diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e2caa8de..d7286c88 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,7 +42,7 @@ jobs: run: sudo find /MITK/ -exec touch -a -m -d 20210401 {} \; - name: Clone CemrgApp - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: CemrgApp From 7d5b16ae38ecf04ea91682d6630fd11f28988e29 Mon Sep 17 00:00:00 2001 From: Jost Migenda Date: Wed, 17 Apr 2024 18:46:05 +0100 Subject: [PATCH 2/5] Update actions/upload-artifact and actions/download-artifact to v4 For details, see https://github.blog/2024-02-12-get-started-with-v4-of-github-actions-artifacts/ --- .github/workflows/build.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de61c9cc..7ebfddc2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,10 @@ jobs: needs: [Variables, Build-Linux, Build-macOS] steps: - name: Download packages - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: - name: Packages + pattern: Packages-* + merge-multiple: true - name: Upload Linux package uses: actions/upload-release-asset@v1.0.2 @@ -128,9 +129,9 @@ jobs: mv CemrgApp-Linux.zip ${{ github.workspace }}/ - name: Upload package - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: Packages + name: Packages-Linux path: CemrgApp-Linux.zip @@ -209,9 +210,9 @@ jobs: # move CemrgApp-Windows.zip ${{ github.workspace }}\ # # - name: Upload package - # uses: actions/upload-artifact@v2 + # uses: actions/upload-artifact@v4 # with: - # name: Packages + # name: Packages-Windows # path: CemrgApp-Windows.zip @@ -313,7 +314,7 @@ jobs: hdiutil create -volname CemrgApp -srcfolder /Users/Shared/CemrgApp-macOS -ov -format UDZO ${{ github.workspace }}/CemrgApp-macOS.dmg - name: Upload package - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: Packages + name: Packages-macOS path: CemrgApp-macOS.dmg From b51ae482b12d07c1ef904a5a88f0561eed644745 Mon Sep 17 00:00:00 2001 From: Jost Migenda Date: Wed, 17 Apr 2024 18:50:04 +0100 Subject: [PATCH 3/5] Update codecov/codecov-action to v4 v1 is unsupported since 2022; several arguments were changed/removed since then. See https://github.com/codecov/codecov-action/tree/v3?tab=readme-ov-file#codecov-github-action --- .github/workflows/test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d7286c88..f9c72fd6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,10 +64,9 @@ jobs: run: ctest -R Cemrg -V - name: Code Coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} - functionalities: coveragepy root_dir: /CemrgApp/ - gcov_root_dir: /Build/MITK-build directory: ${{ github.workspace }} + plugin: gcov From cdaa6dd0997b7bb8051f02447adcd5fabbac0792 Mon Sep 17 00:00:00 2001 From: Jost Migenda Date: Wed, 17 Apr 2024 18:52:21 +0100 Subject: [PATCH 4/5] test.yml: update packages for ubuntu-20.04 h/t to @LouiseABowler (discussion on Slack) --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f9c72fd6..dcc900a3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: - name: Install missing packages run: | sudo apt update - sudo DEBIAN_FRONTEND=noninteractive apt install libxt-dev libtiff5-dev libfontconfig1 mesa-common-dev libglu1-mesa-dev libxcomposite1 libxcursor1 libxrender1 libxi6 libxtst6 libasound2 libnspr4 libnss3 libxkbcommon-dev libxkbcommon-x11-dev libtbb2 doxygen git cmake python3-pip gcc-6 g++-6 -y + sudo DEBIAN_FRONTEND=noninteractive apt install libxt-dev libtiff5-dev libfontconfig1 mesa-common-dev libglu1-mesa-dev libxcomposite1 libxcursor1 libxrender1 libxi6 libxtst6 libasound2 libnspr4 libnss3 libxkbcommon-dev libxkbcommon-x11-dev libtbb2 doxygen git cmake python3-pip gcc g++ -y sudo apt remove --auto-remove icu-devtools libicu-dev -y - name: Install Qt From 80c3852facc53d6dd39c290c47559198b6a0aa80 Mon Sep 17 00:00:00 2001 From: Jost Migenda Date: Wed, 17 Apr 2024 19:10:30 +0100 Subject: [PATCH 5/5] more gcc/g++ updates --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ebfddc2..597731dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: - name: Install missing packages run: | sudo apt update - sudo DEBIAN_FRONTEND=noninteractive apt install libxt-dev libtiff5-dev libfontconfig1 mesa-common-dev libglu1-mesa-dev libxcomposite1 libxcursor1 libxrender1 libxi6 libxtst6 libasound2 libnspr4 libnss3 libxkbcommon-dev libxkbcommon-x11-dev doxygen git cmake python3-pip gcc-6 g++-6 -y + sudo DEBIAN_FRONTEND=noninteractive apt install libxt-dev libtiff5-dev libfontconfig1 mesa-common-dev libglu1-mesa-dev libxcomposite1 libxcursor1 libxrender1 libxi6 libxtst6 libasound2 libnspr4 libnss3 libxkbcommon-dev libxkbcommon-x11-dev doxygen git cmake python3-pip gcc g++ -y sudo apt remove --auto-remove icu-devtools libicu-dev -y - name: Install Qt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dcc900a3..dc5d5be9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -52,8 +52,8 @@ jobs: - name: Build working-directory: /Build env: - CC: gcc-6 - CXX: g++-6 + CC: gcc + CXX: g++ run: make -j4 - name: Test