From cf5e089578da69ca6f2b33c2b445937585e669b2 Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Tue, 24 Sep 2024 16:24:08 +0530 Subject: [PATCH 1/7] fix failure for same artifact name --- .github/workflows/bundles-kit.yml | 2 +- .github/workflows/bundles-linux.yml | 8 +++++++- .github/workflows/bundles-mac.yml | 2 +- .github/workflows/bundles-mac_aarch64.yml | 2 +- .github/workflows/bundles-windows.yml | 2 +- .github/workflows/early-access.yml | 2 ++ .github/workflows/release.yml | 2 ++ 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bundles-kit.yml b/.github/workflows/bundles-kit.yml index 5ebf42902..16f0cb9b4 100644 --- a/.github/workflows/bundles-kit.yml +++ b/.github/workflows/bundles-kit.yml @@ -42,5 +42,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: artifacts + name: scenebuilder-kit-${{ inputs.project-version }}.jar path: kit/target/lib/*.jar diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml index a75ba423f..2c2779f29 100644 --- a/.github/workflows/bundles-linux.yml +++ b/.github/workflows/bundles-linux.yml @@ -101,7 +101,13 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: artifacts + name: SceneBuilder-${{ inputs.project-version }}.deb path: | app/target/install/*.deb + + - name: Upload Artifact + uses: actions/upload-artifact@v4 + with: + name: SceneBuilder-${{ inputs.project-version }}.rpm + path: | app/target/install/*.rpm diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml index 9b1926780..eba604c32 100644 --- a/.github/workflows/bundles-mac.yml +++ b/.github/workflows/bundles-mac.yml @@ -114,5 +114,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: artifacts + name: SceneBuilder-${{ inputs.project-version }}-amd64.dmg path: ${{ steps.outputfile.outputs.path }} diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml index cf62adac0..627c53eb8 100644 --- a/.github/workflows/bundles-mac_aarch64.yml +++ b/.github/workflows/bundles-mac_aarch64.yml @@ -115,5 +115,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: artifacts + name: SceneBuilder-${{ inputs.project-version }}-amd64.dmg path: ${{ steps.outputfile.outputs.path }} diff --git a/.github/workflows/bundles-windows.yml b/.github/workflows/bundles-windows.yml index a2100e624..a4009f006 100644 --- a/.github/workflows/bundles-windows.yml +++ b/.github/workflows/bundles-windows.yml @@ -96,5 +96,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: artifacts + name: SceneBuilder-${{ inputs.project-version }}.msi path: app/target/install/*.msi diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index 52966dac1..eed1b788b 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -121,6 +121,8 @@ jobs: - name: Download all build artifacts uses: actions/download-artifact@v4 + with: + path: artifacts - name: Set up Java uses: oracle-actions/setup-java@v1.4.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab62b791e..8b85feed5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -147,6 +147,8 @@ jobs: - name: Download all build artifacts uses: actions/download-artifact@v4 + with: + path: artifacts - name: Set Release Version run: | From 0dc1bfe5575daf8543d47817aa3d5f2f4363fab9 Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Tue, 24 Sep 2024 16:32:47 +0530 Subject: [PATCH 2/7] fix name and remove mac for test --- .github/workflows/bundles-mac_aarch64.yml | 2 +- .github/workflows/early-access.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml index 627c53eb8..c59950aa1 100644 --- a/.github/workflows/bundles-mac_aarch64.yml +++ b/.github/workflows/bundles-mac_aarch64.yml @@ -115,5 +115,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: SceneBuilder-${{ inputs.project-version }}-amd64.dmg + name: SceneBuilder-${{ inputs.project-version }}-aarch64.dmg path: ${{ steps.outputfile.outputs.path }} diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index eed1b788b..01373b06d 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -110,7 +110,7 @@ jobs: project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }} early-access: - needs: [precheck, linux-bundles, windows-bundles, mac-bundles, mac_aarch64-bundles, kit-bundles] + needs: [precheck, linux-bundles, windows-bundles, kit-bundles] if: endsWith(${{ needs.precheck.outputs.PROJECT_VERSION }}, '-SNAPSHOT') runs-on: ubuntu-20.04 steps: From 384168288a710fdfa9e2f2718ff49c7dec556a8b Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Tue, 24 Sep 2024 16:42:58 +0530 Subject: [PATCH 3/7] remove mac from jreleaser --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 40fe20d87..28440c1a8 100644 --- a/pom.xml +++ b/pom.xml @@ -286,7 +286,7 @@ true - + {{artifactsDir}}/{{distributionName}}-{{projectVersion}}.msi windows-x86_64 From 8f7015df0d7c30abee73d434a5607dd7e60a7600 Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Tue, 24 Sep 2024 17:07:11 +0530 Subject: [PATCH 4/7] add debug log --- .github/workflows/early-access.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index 01373b06d..77dee79df 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -141,6 +141,7 @@ jobs: env: JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + ls -l artifacts mvn -B -ntp -pl :parent -DartifactsDir=artifacts jreleaser:release - name: JReleaser output From c14d5d9e83d11dc9c32dd2da9a0b268540e56d42 Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Tue, 24 Sep 2024 17:29:55 +0530 Subject: [PATCH 5/7] add logs --- .github/workflows/early-access.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index 77dee79df..1d7a1e30c 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -142,6 +142,8 @@ jobs: JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | ls -l artifacts + ls -l artifacts/SceneBuilder-23.0.0-SNAPSHOT.deb + find artifacts mvn -B -ntp -pl :parent -DartifactsDir=artifacts jreleaser:release - name: JReleaser output From bf40040a2eb61f22f8ab4a4ec45e6e72e021d4d8 Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Tue, 24 Sep 2024 17:36:31 +0530 Subject: [PATCH 6/7] fix dir structure --- .github/workflows/early-access.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index 1d7a1e30c..e770a54bc 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -123,6 +123,7 @@ jobs: uses: actions/download-artifact@v4 with: path: artifacts + merge-multiple: true - name: Set up Java uses: oracle-actions/setup-java@v1.4.0 From 4c2d19dd0babbbf043e12f302bb4388af9d2b266 Mon Sep 17 00:00:00 2001 From: Abhinay Agarwal Date: Tue, 24 Sep 2024 17:45:46 +0530 Subject: [PATCH 7/7] revert changes --- .github/workflows/early-access.yml | 5 +---- .github/workflows/release.yml | 1 + pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index e770a54bc..ef2bcb60b 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -110,7 +110,7 @@ jobs: project-version: ${{ needs.precheck.outputs.PROJECT_VERSION }} early-access: - needs: [precheck, linux-bundles, windows-bundles, kit-bundles] + needs: [precheck, linux-bundles, windows-bundles, mac-bundles, mac_aarch64-bundles, kit-bundles] if: endsWith(${{ needs.precheck.outputs.PROJECT_VERSION }}, '-SNAPSHOT') runs-on: ubuntu-20.04 steps: @@ -142,9 +142,6 @@ jobs: env: JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - ls -l artifacts - ls -l artifacts/SceneBuilder-23.0.0-SNAPSHOT.deb - find artifacts mvn -B -ntp -pl :parent -DartifactsDir=artifacts jreleaser:release - name: JReleaser output diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b85feed5..49b800eba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -149,6 +149,7 @@ jobs: uses: actions/download-artifact@v4 with: path: artifacts + merge-multiple: true - name: Set Release Version run: | diff --git a/pom.xml b/pom.xml index 28440c1a8..40fe20d87 100644 --- a/pom.xml +++ b/pom.xml @@ -286,7 +286,7 @@ true - + {{artifactsDir}}/{{distributionName}}-{{projectVersion}}.msi windows-x86_64