From b79705c8942377c0ce4ee1d074e2b73a0ca1a64b Mon Sep 17 00:00:00 2001 From: Vijai Kumar S Date: Mon, 10 Jun 2024 00:47:48 +0530 Subject: [PATCH 1/6] Include an additional artifact that packs the code with submodules --- .github/workflows/build.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b0c6d77b..2b0e35266 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -506,6 +506,22 @@ jobs: cmake --build . ./Example_ExtractInfo ../../../Examples/Files/Helix.3mf + deploy-source-code-with-submodules: + runs-on: ubuntu-20.04 + needs: [set-lib3mf-version, assemble-sdk] + env: + LIB3MF_VERSION: ${{ needs.set-lib3mf-version.outputs.lib3mf-version }} + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - run: zip -r lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules.zip . + - name: Upload Artifact + uses: actions/upload-artifact@v4 + with: + name: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules + path: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules.zip + set-integration-tests-status: runs-on: ubuntu-20.04 From c03749cbb32d54cf78bcd273a524fa1dfd491b00 Mon Sep 17 00:00:00 2001 From: Vijai Kumar S Date: Mon, 10 Jun 2024 01:22:33 +0530 Subject: [PATCH 2/6] . --- .github/workflows/build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b0e35266..e8e50b4e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -506,16 +506,19 @@ jobs: cmake --build . ./Example_ExtractInfo ../../../Examples/Files/Helix.3mf - deploy-source-code-with-submodules: + deploy-artifact-with-submodules: runs-on: ubuntu-20.04 - needs: [set-lib3mf-version, assemble-sdk] + needs: [ set-lib3mf-version ] env: LIB3MF_VERSION: ${{ needs.set-lib3mf-version.outputs.lib3mf-version }} steps: - uses: actions/checkout@v4 with: submodules: true - - run: zip -r lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules.zip . + - run: | + rsync -av --progress . ./temp --exclude .git --exclude .gitignore --exclude .github --exclude .gitmodules --exclude *.yml + cd temp + zip -r ../lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules.zip . - name: Upload Artifact uses: actions/upload-artifact@v4 with: @@ -523,9 +526,10 @@ jobs: path: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules.zip + set-integration-tests-status: runs-on: ubuntu-20.04 - needs: [ deploy-linux, deploy-windows, deploy-macos ] + needs: [ deploy-linux, deploy-windows, deploy-macos, deploy-source-code-with-submodules ] outputs: run_integration_tests: ${{ steps.set-status.outputs.run_integration_tests }} steps: From 9e86cf1feae26775323b2bb659bc66a9b1a6d099 Mon Sep 17 00:00:00 2001 From: Vijai Kumar S Date: Mon, 10 Jun 2024 01:24:26 +0530 Subject: [PATCH 3/6] exclude unnecessary stuff --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8e50b4e0..67779e271 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -506,9 +506,9 @@ jobs: cmake --build . ./Example_ExtractInfo ../../../Examples/Files/Helix.3mf - deploy-artifact-with-submodules: + deploy-source-code-with-submodules: runs-on: ubuntu-20.04 - needs: [ set-lib3mf-version ] + needs: [ set-lib3mf-version, assemble-sdk ] env: LIB3MF_VERSION: ${{ needs.set-lib3mf-version.outputs.lib3mf-version }} steps: From d98f1d29f7ebd20d9f245a10bdedf128b476a209 Mon Sep 17 00:00:00 2001 From: Vijai Kumar S Date: Mon, 10 Jun 2024 01:43:51 +0530 Subject: [PATCH 4/6] Some changes --- .github/workflows/build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 67779e271..12251b63e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -516,14 +516,13 @@ jobs: with: submodules: true - run: | - rsync -av --progress . ./temp --exclude .git --exclude .gitignore --exclude .github --exclude .gitmodules --exclude *.yml - cd temp - zip -r ../lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules.zip . + mkdir -p lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules + rsync -av --progress . ./lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules --exclude .git --exclude .gitignore --exclude .github --exclude .gitmodules --exclude *.yml - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules - path: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules.zip + name: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules.zip + path: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules From 9c7c36366c0dbae2deb886b0a8895b2ce6390834 Mon Sep 17 00:00:00 2001 From: Vijai Kumar S Date: Mon, 10 Jun 2024 02:04:36 +0530 Subject: [PATCH 5/6] avoid recursion --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12251b63e..53950700d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -517,7 +517,7 @@ jobs: submodules: true - run: | mkdir -p lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules - rsync -av --progress . ./lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules --exclude .git --exclude .gitignore --exclude .github --exclude .gitmodules --exclude *.yml + rsync -av --progress . ./lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules --exclude .git --exclude .gitignore --exclude .github --exclude .gitmodules --exclude *.yml --exclude lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules - name: Upload Artifact uses: actions/upload-artifact@v4 with: From 136761ff435dad2c0acb38340295450687556242 Mon Sep 17 00:00:00 2001 From: Vijai Kumar S Date: Mon, 10 Jun 2024 02:21:49 +0530 Subject: [PATCH 6/6] avoid zip.zip --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53950700d..0d8cd36cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -521,7 +521,7 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules.zip + name: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules path: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules