From d09ab88849293120e0677dcda813397e11677463 Mon Sep 17 00:00:00 2001 From: Lewis Clark Date: Wed, 2 Nov 2022 09:37:49 +0000 Subject: [PATCH 01/10] Upload library artifact --- .github/workflows/ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c579dd1..685f3ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,6 +45,11 @@ jobs: working-directory: ${{runner.workspace}}/build shell: bash run: ctest -V -C ${{matrix.build_type}} + + - uses: actions/upload-artifact@v3 + with: + name: ${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}} + path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/libgluasteal.dll windows: strategy: matrix: @@ -79,6 +84,11 @@ jobs: - name: Test working-directory: ${{runner.workspace}}/build run: ctest -V -C ${{matrix.build_type}} --timeout 60 + + - uses: actions/upload-artifact@v3 + with: + name: ${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}} + path: ${{runner.workspace}}/build/src/libgluasteal.so macos: strategy: matrix: @@ -117,3 +127,8 @@ jobs: shell: bash run: ctest -V -C ${{matrix.build_type}} + - uses: actions/upload-artifact@v3 + with: + name: ${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}} + path: ${{runner.workspace}}/build/src/libgluasteal.dylib + From 537c71b1093c0c7ad4e965d66e26c582f4e9f460 Mon Sep 17 00:00:00 2001 From: Lewis Clark Date: Wed, 2 Nov 2022 09:39:15 +0000 Subject: [PATCH 02/10] Fix indentation --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 685f3ef..89039de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,9 +47,9 @@ jobs: run: ctest -V -C ${{matrix.build_type}} - uses: actions/upload-artifact@v3 - with: - name: ${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}} - path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/libgluasteal.dll + with: + name: ${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}} + path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/libgluasteal.dll windows: strategy: matrix: @@ -86,9 +86,9 @@ jobs: run: ctest -V -C ${{matrix.build_type}} --timeout 60 - uses: actions/upload-artifact@v3 - with: - name: ${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}} - path: ${{runner.workspace}}/build/src/libgluasteal.so + with: + name: ${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}} + path: ${{runner.workspace}}/build/src/libgluasteal.so macos: strategy: matrix: @@ -128,7 +128,7 @@ jobs: run: ctest -V -C ${{matrix.build_type}} - uses: actions/upload-artifact@v3 - with: - name: ${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}} - path: ${{runner.workspace}}/build/src/libgluasteal.dylib + with: + name: ${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}} + path: ${{runner.workspace}}/build/src/libgluasteal.dylib From e48bde35088db720773b8ffb7d02e727c8638e05 Mon Sep 17 00:00:00 2001 From: Lewis Clark Date: Wed, 2 Nov 2022 09:45:41 +0000 Subject: [PATCH 03/10] Fix artifact path --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89039de..4d0aba0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: - uses: actions/upload-artifact@v3 with: name: ${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}} - path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/libgluasteal.dll + path: ${{runner.workspace}}/build/src/libgluasteal.so windows: strategy: matrix: @@ -88,7 +88,7 @@ jobs: - uses: actions/upload-artifact@v3 with: name: ${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}} - path: ${{runner.workspace}}/build/src/libgluasteal.so + path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/libgluasteal.dll macos: strategy: matrix: From f2eae5e12a7adc5f8d157774463f181ba815cdb8 Mon Sep 17 00:00:00 2001 From: Lewis Clark Date: Wed, 2 Nov 2022 09:50:23 +0000 Subject: [PATCH 04/10] Add arch to windows artifact path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d0aba0..c13f705 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,7 +88,7 @@ jobs: - uses: actions/upload-artifact@v3 with: name: ${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}} - path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/libgluasteal.dll + path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/${{matrix.arch}}/libgluasteal.dll macos: strategy: matrix: From a2c085c2475e8e9d32f9eaca577fdbc0c04e561b Mon Sep 17 00:00:00 2001 From: Lewis Clark Date: Wed, 2 Nov 2022 09:59:23 +0000 Subject: [PATCH 05/10] List files --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c13f705..cc26a5c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: - name: Test working-directory: ${{runner.workspace}}/build - run: ctest -V -C ${{matrix.build_type}} --timeout 60 + run: ctest -V -C ${{matrix.build_type}} --timeout 60 && dir /a-D /S /B - uses: actions/upload-artifact@v3 with: From 4de901a5d14edc6247b22e5256a799ef17fc3519 Mon Sep 17 00:00:00 2001 From: Lewis Clark Date: Wed, 2 Nov 2022 10:06:28 +0000 Subject: [PATCH 06/10] Fix file path for windows artifact --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc26a5c..831ee1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,12 +83,12 @@ jobs: - name: Test working-directory: ${{runner.workspace}}/build - run: ctest -V -C ${{matrix.build_type}} --timeout 60 && dir /a-D /S /B + run: ctest -V -C ${{matrix.build_type}} --timeout 60 - uses: actions/upload-artifact@v3 with: name: ${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}} - path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/${{matrix.arch}}/libgluasteal.dll + path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/gluasteal.dll macos: strategy: matrix: From fc8d9dafd0f6c036fb8d9c60d1f6a07cbf2f5d2c Mon Sep 17 00:00:00 2001 From: Lewis Clark Date: Wed, 2 Nov 2022 10:15:22 +0000 Subject: [PATCH 07/10] Error when file not found and set retention period --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 831ee1e..c682f45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,8 @@ jobs: with: name: ${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}} path: ${{runner.workspace}}/build/src/libgluasteal.so + if-no-files-found: error + retention-days: 14 windows: strategy: matrix: @@ -89,6 +91,8 @@ jobs: with: name: ${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}} path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/gluasteal.dll + if-no-files-found: error + retention-days: 14 macos: strategy: matrix: @@ -131,4 +135,6 @@ jobs: with: name: ${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}} path: ${{runner.workspace}}/build/src/libgluasteal.dylib + if-no-files-found: error + retention-days: 14 From be7f910fe34fdd3de5f6b9be77534e4716a8733c Mon Sep 17 00:00:00 2001 From: Lewis Clark Date: Wed, 2 Nov 2022 10:34:16 +0000 Subject: [PATCH 08/10] Group artifacts by OS --- .github/workflows/ci.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c682f45..651a94e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,7 @@ jobs: name: "${{matrix.os.name}} ${{matrix.build_type}} ${{matrix.toolchain}}" runs-on: ${{matrix.os.distro}} + artifact-path: ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}}.so steps: - uses: actions/checkout@v3 @@ -46,10 +47,13 @@ jobs: shell: bash run: ctest -V -C ${{matrix.build_type}} + - name: Rename library artifact + run: mv ${{runner.workspace}}/build/src/libgluasteal.so ${{artifact-path}} + - uses: actions/upload-artifact@v3 with: - name: ${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}} - path: ${{runner.workspace}}/build/src/libgluasteal.so + name: "Linux" + path: ${{artifact-path}} if-no-files-found: error retention-days: 14 windows: @@ -63,6 +67,7 @@ jobs: name: "${{matrix.os.name}} ${{matrix.build_type}} ${{matrix.arch}}" runs-on: ${{matrix.os.distro}} + artifact-path: ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}}.dll steps: - uses: actions/checkout@v3 @@ -87,10 +92,13 @@ jobs: working-directory: ${{runner.workspace}}/build run: ctest -V -C ${{matrix.build_type}} --timeout 60 + - name: Rename library artifact + run: move ${{runner.workspace}}/build/src/${{matrix.build_type}}/gluasteal.dll ${{artifact-path}} + - uses: actions/upload-artifact@v3 with: - name: ${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}} - path: ${{runner.workspace}}/build/src/${{matrix.build_type}}/gluasteal.dll + name: "Windows" + path: ${{artifact-path}} if-no-files-found: error retention-days: 14 macos: @@ -104,6 +112,7 @@ jobs: name: "${{matrix.os.name}} ${{matrix.build_type}} ${{matrix.toolchain}}" runs-on: ${{matrix.os.distro}} + artifact-path: ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}}.dylib steps: - uses: actions/checkout@v3 @@ -131,10 +140,13 @@ jobs: shell: bash run: ctest -V -C ${{matrix.build_type}} + - name: Rename library artifact + run: mv ${{runner.workspace}}/build/src/libgluasteal.dylib ${{artifact-path}} + - uses: actions/upload-artifact@v3 with: - name: ${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}} - path: ${{runner.workspace}}/build/src/libgluasteal.dylib + name: "macOS" + path: ${{artifact-path}} if-no-files-found: error retention-days: 14 From f9cbd7a6ccb26742e9cbee1c93cd28727dcb8413 Mon Sep 17 00:00:00 2001 From: Lewis Clark Date: Wed, 2 Nov 2022 10:35:08 +0000 Subject: [PATCH 09/10] Quotes --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 651a94e..8236789 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: name: "${{matrix.os.name}} ${{matrix.build_type}} ${{matrix.toolchain}}" runs-on: ${{matrix.os.distro}} - artifact-path: ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}}.so + artifact-path: "${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}}.so" steps: - uses: actions/checkout@v3 @@ -67,7 +67,7 @@ jobs: name: "${{matrix.os.name}} ${{matrix.build_type}} ${{matrix.arch}}" runs-on: ${{matrix.os.distro}} - artifact-path: ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}}.dll + artifact-path: "${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}}.dll" steps: - uses: actions/checkout@v3 @@ -112,7 +112,7 @@ jobs: name: "${{matrix.os.name}} ${{matrix.build_type}} ${{matrix.toolchain}}" runs-on: ${{matrix.os.distro}} - artifact-path: ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}}.dylib + artifact-path: "${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}}.dylib" steps: - uses: actions/checkout@v3 From 2b56b8aeef1401397aa404a1a1e5913c5c65a674 Mon Sep 17 00:00:00 2001 From: Lewis Clark Date: Wed, 2 Nov 2022 10:38:08 +0000 Subject: [PATCH 10/10] Remove variable --- .github/workflows/ci.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8236789..6cbdb55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ jobs: name: "${{matrix.os.name}} ${{matrix.build_type}} ${{matrix.toolchain}}" runs-on: ${{matrix.os.distro}} - artifact-path: "${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}}.so" steps: - uses: actions/checkout@v3 @@ -48,12 +47,12 @@ jobs: run: ctest -V -C ${{matrix.build_type}} - name: Rename library artifact - run: mv ${{runner.workspace}}/build/src/libgluasteal.so ${{artifact-path}} + run: mv ${{runner.workspace}}/build/src/libgluasteal.so ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}}.so - uses: actions/upload-artifact@v3 with: name: "Linux" - path: ${{artifact-path}} + path: ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-gcc${{matrix.os.gcc_version}}-${{matrix.toolchain}}-${{matrix.build_type}}.so if-no-files-found: error retention-days: 14 windows: @@ -67,7 +66,6 @@ jobs: name: "${{matrix.os.name}} ${{matrix.build_type}} ${{matrix.arch}}" runs-on: ${{matrix.os.distro}} - artifact-path: "${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}}.dll" steps: - uses: actions/checkout@v3 @@ -93,12 +91,12 @@ jobs: run: ctest -V -C ${{matrix.build_type}} --timeout 60 - name: Rename library artifact - run: move ${{runner.workspace}}/build/src/${{matrix.build_type}}/gluasteal.dll ${{artifact-path}} + run: move ${{runner.workspace}}/build/src/${{matrix.build_type}}/gluasteal.dll ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}}.dll - uses: actions/upload-artifact@v3 with: name: "Windows" - path: ${{artifact-path}} + path: ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.arch}}-${{matrix.build_type}}.dll if-no-files-found: error retention-days: 14 macos: @@ -112,7 +110,6 @@ jobs: name: "${{matrix.os.name}} ${{matrix.build_type}} ${{matrix.toolchain}}" runs-on: ${{matrix.os.distro}} - artifact-path: "${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}}.dylib" steps: - uses: actions/checkout@v3 @@ -141,12 +138,12 @@ jobs: run: ctest -V -C ${{matrix.build_type}} - name: Rename library artifact - run: mv ${{runner.workspace}}/build/src/libgluasteal.dylib ${{artifact-path}} + run: mv ${{runner.workspace}}/build/src/libgluasteal.dylib ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}}.dylib - uses: actions/upload-artifact@v3 with: name: "macOS" - path: ${{artifact-path}} + path: ${{runner.workspace}}/build/gluasteal-${{matrix.os.distro}}-${{matrix.toolchain}}-${{matrix.build_type}}.dylib if-no-files-found: error retention-days: 14