From 4a6c78e1a7299fadf4e695a9295682c6c0661961 Mon Sep 17 00:00:00 2001 From: halentin Date: Tue, 18 Jun 2024 08:45:01 +0000 Subject: [PATCH 1/7] add 32 bit workflow for windows --- .github/workflows/callbackFunctions.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/callbackFunctions.yml b/.github/workflows/callbackFunctions.yml index 0ba6379..eef1e34 100644 --- a/.github/workflows/callbackFunctions.yml +++ b/.github/workflows/callbackFunctions.yml @@ -15,6 +15,9 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest, macos-latest] + include: + - os: windows-latest + arch: -A Win32 env: BUILD_TYPE: RelWithDebInfo CMAKE_SOURCE_DIR: ${{github.workspace}}/src/FMI2/callbackFunctions @@ -25,7 +28,7 @@ jobs: uses: actions/checkout@v3 - name: Configure CMake - run: cmake -S ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions -B ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + run: cmake -S ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions -B ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} ${{ matrix.arch }} - name: Build C++ Sources run: cmake --build ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build --config ${{env.BUILD_TYPE}} --target install @@ -39,12 +42,19 @@ jobs: run: ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build/test - name: Archive production artifacts (win) - if: success() && matrix.os == 'windows-latest' + if: success() && matrix.os == 'windows-latest' && arch == '' uses: actions/upload-artifact@v3 with: name: callbackFunctions-win-binaries path: src/FMI2/callbackFunctions/binaries/win64/ + - name: Archive production artifacts (win32) + if: success() && matrix.os == 'windows-latest' && arch != '' + uses: actions/upload-artifact@v3 + with: + name: callbackFunctions-win-binaries + path: src/FMI2/callbackFunctions/binaries/win32/ + - name: Archive production artifacts (linux) if: success() && matrix.os == 'ubuntu-latest' uses: actions/upload-artifact@v3 @@ -72,6 +82,12 @@ jobs: name: callbackFunctions-win-binaries path: src/FMI2/callbackFunctions/binaries/win64/ + - name: Download windows x86 binaries + uses: actions/download-artifact@v3 + with: + name: callbackFunctions-win-binaries + path: src/FMI2/callbackFunctions/binaries/win32/ + - name: Download linux binaries uses: actions/download-artifact@v3 with: From 3a9cbc69e4d66b17c9f83ff7e499a285db83a9eb Mon Sep 17 00:00:00 2001 From: halentin Date: Tue, 18 Jun 2024 08:50:48 +0000 Subject: [PATCH 2/7] add targetplatform --- .github/workflows/callbackFunctions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/callbackFunctions.yml b/.github/workflows/callbackFunctions.yml index eef1e34..3578091 100644 --- a/.github/workflows/callbackFunctions.yml +++ b/.github/workflows/callbackFunctions.yml @@ -17,7 +17,7 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] include: - os: windows-latest - arch: -A Win32 + targetplatform: x86 env: BUILD_TYPE: RelWithDebInfo CMAKE_SOURCE_DIR: ${{github.workspace}}/src/FMI2/callbackFunctions @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v3 - name: Configure CMake - run: cmake -S ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions -B ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} ${{ matrix.arch }} + run: cmake -S ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions -B ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - name: Build C++ Sources run: cmake --build ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build --config ${{env.BUILD_TYPE}} --target install From dc2ea1c8650642578bbe891756d8ec8e8642247e Mon Sep 17 00:00:00 2001 From: halentin Date: Tue, 18 Jun 2024 08:52:03 +0000 Subject: [PATCH 3/7] fix --- .github/workflows/callbackFunctions.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/callbackFunctions.yml b/.github/workflows/callbackFunctions.yml index 3578091..fa5bfaa 100644 --- a/.github/workflows/callbackFunctions.yml +++ b/.github/workflows/callbackFunctions.yml @@ -17,7 +17,7 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] include: - os: windows-latest - targetplatform: x86 + arch: -A Win32 env: BUILD_TYPE: RelWithDebInfo CMAKE_SOURCE_DIR: ${{github.workspace}}/src/FMI2/callbackFunctions @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v3 - name: Configure CMake - run: cmake -S ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions -B ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + run: cmake -S ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions -B ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} ${{ matrix.arch }} - name: Build C++ Sources run: cmake --build ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build --config ${{env.BUILD_TYPE}} --target install @@ -42,14 +42,14 @@ jobs: run: ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build/test - name: Archive production artifacts (win) - if: success() && matrix.os == 'windows-latest' && arch == '' + if: success() && matrix.os == 'windows-latest' && matrix.arch == '' uses: actions/upload-artifact@v3 with: name: callbackFunctions-win-binaries path: src/FMI2/callbackFunctions/binaries/win64/ - name: Archive production artifacts (win32) - if: success() && matrix.os == 'windows-latest' && arch != '' + if: success() && matrix.os == 'windows-latest' && matrix.arch != '' uses: actions/upload-artifact@v3 with: name: callbackFunctions-win-binaries @@ -86,7 +86,7 @@ jobs: uses: actions/download-artifact@v3 with: name: callbackFunctions-win-binaries - path: src/FMI2/callbackFunctions/binaries/win32/ + path: src/FMI2/callbackFunctions/binaries/win3/ - name: Download linux binaries uses: actions/download-artifact@v3 From e75ea00246a51124fd907ce5074481cd60d3dd6f Mon Sep 17 00:00:00 2001 From: halentin Date: Tue, 18 Jun 2024 08:53:27 +0000 Subject: [PATCH 4/7] how does matrix work --- .github/workflows/callbackFunctions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/callbackFunctions.yml b/.github/workflows/callbackFunctions.yml index fa5bfaa..955d192 100644 --- a/.github/workflows/callbackFunctions.yml +++ b/.github/workflows/callbackFunctions.yml @@ -15,6 +15,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest, macos-latest] + arch: [''] include: - os: windows-latest arch: -A Win32 From c884f66b1fd5b17555ba2653f876d7b22ded4fdb Mon Sep 17 00:00:00 2001 From: halentin Date: Tue, 18 Jun 2024 08:55:20 +0000 Subject: [PATCH 5/7] typo --- .github/workflows/callbackFunctions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/callbackFunctions.yml b/.github/workflows/callbackFunctions.yml index 955d192..42bd082 100644 --- a/.github/workflows/callbackFunctions.yml +++ b/.github/workflows/callbackFunctions.yml @@ -87,7 +87,7 @@ jobs: uses: actions/download-artifact@v3 with: name: callbackFunctions-win-binaries - path: src/FMI2/callbackFunctions/binaries/win3/ + path: src/FMI2/callbackFunctions/binaries/win32/ - name: Download linux binaries uses: actions/download-artifact@v3 From 16aa063c3857df416a4827bc7d68d81fa5b344e8 Mon Sep 17 00:00:00 2001 From: halentin Date: Tue, 18 Jun 2024 09:02:47 +0000 Subject: [PATCH 6/7] fix names --- .github/workflows/callbackFunctions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/callbackFunctions.yml b/.github/workflows/callbackFunctions.yml index 42bd082..e9b4993 100644 --- a/.github/workflows/callbackFunctions.yml +++ b/.github/workflows/callbackFunctions.yml @@ -53,7 +53,7 @@ jobs: if: success() && matrix.os == 'windows-latest' && matrix.arch != '' uses: actions/upload-artifact@v3 with: - name: callbackFunctions-win-binaries + name: callbackFunctions-win32-binaries path: src/FMI2/callbackFunctions/binaries/win32/ - name: Archive production artifacts (linux) @@ -86,7 +86,7 @@ jobs: - name: Download windows x86 binaries uses: actions/download-artifact@v3 with: - name: callbackFunctions-win-binaries + name: callbackFunctions-win32-binaries path: src/FMI2/callbackFunctions/binaries/win32/ - name: Download linux binaries From 5e0dbe6dafbde2b781437796e2765dd6b5b6142e Mon Sep 17 00:00:00 2001 From: halentin Date: Tue, 18 Jun 2024 10:30:52 +0000 Subject: [PATCH 7/7] bump git action versions --- .github/workflows/callbackFunctions.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/callbackFunctions.yml b/.github/workflows/callbackFunctions.yml index e9b4993..a1c104a 100644 --- a/.github/workflows/callbackFunctions.yml +++ b/.github/workflows/callbackFunctions.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Check out repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Configure CMake run: cmake -S ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions -B ${{env.CMAKE_SOURCE_DIR}}/callbackFunctions/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} ${{ matrix.arch }} @@ -44,28 +44,28 @@ jobs: - name: Archive production artifacts (win) if: success() && matrix.os == 'windows-latest' && matrix.arch == '' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: callbackFunctions-win-binaries path: src/FMI2/callbackFunctions/binaries/win64/ - name: Archive production artifacts (win32) if: success() && matrix.os == 'windows-latest' && matrix.arch != '' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: callbackFunctions-win32-binaries path: src/FMI2/callbackFunctions/binaries/win32/ - name: Archive production artifacts (linux) if: success() && matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: callbackFunctions-linux-binaries path: src/FMI2/callbackFunctions/binaries/linux64/ - name: Archive production artifacts (darwin) if: success() && matrix.os == 'macos-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: callbackFunctions-mac-binaries path: src/FMI2/callbackFunctions/binaries/darwin64/ @@ -75,35 +75,35 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Download windows binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: callbackFunctions-win-binaries path: src/FMI2/callbackFunctions/binaries/win64/ - name: Download windows x86 binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: callbackFunctions-win32-binaries path: src/FMI2/callbackFunctions/binaries/win32/ - name: Download linux binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: callbackFunctions-linux-binaries path: src/FMI2/callbackFunctions/binaries/linux64/ - name: Download darwin binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: callbackFunctions-mac-binaries path: src/FMI2/callbackFunctions/binaries/darwin64/ - name: "Auto commit" if: ${{ github.event_name == 'push' }} - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Update callbackFunctions push_options: '--force-with-lease'