diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml index 3bcde51a..f8d3998e 100644 --- a/.github/workflows/BuildPR.yml +++ b/.github/workflows/BuildPR.yml @@ -102,9 +102,9 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ success() }} with: - name: DLTViewer-${{ matrix.macos }}-${{ matrix.abi }} - path: build/dist/DLTViewer*.tgz - + name: DLTViewer-MacOS-${{ matrix.abi }} + path: | + build/install/DLTViewer.* buildLinux: name: Build ${{ matrix.ubuntu }} diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 0a12b919..dc2c26c4 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -36,7 +36,7 @@ jobs: - name: Build project run: scripts/darwin/build.sh - name: Archive artifact - run: zip DLT-macOS-${{ matrix.abi }}.zip -r build/dist + run: zip DLT-macOS-${{ matrix.abi }}.zip -r build/install -i 'DLTViewer*' - name: Upload DLT artifact uses: actions/upload-artifact@v4 with: @@ -118,12 +118,14 @@ jobs: uses: actions/download-artifact@v4 with: name: DLT-Linux - - name: Download DLT macOS artifacts + - name: Download DLT macOS artifacts arm64 uses: actions/download-artifact@v4 with: - name: | - DLT-Mac-x86 - DLT-Mac-arm64 + name: DLT-Mac-arm64 + - name: Download DLT macOS artifacts x86 + uses: actions/download-artifact@v4 + with: + name: DLT-Mac-x86 - name: Download DLT Windows parser artifacts uses: actions/download-artifact@v4 with: diff --git a/scripts/darwin/build.sh b/scripts/darwin/build.sh index 4cda2a88..7e2d8ea7 100755 --- a/scripts/darwin/build.sh +++ b/scripts/darwin/build.sh @@ -66,6 +66,11 @@ cd "${BUILD_DIR}" FULL_VERSION=$(cat "${BUILD_DIR}/full_version.txt") echo "FULL_VERSION=${FULL_VERSION}" -mkdir -p dist -cp ../scripts/darwin/install.md dist -tar -czvf "dist/DLTViewer-${FULL_VERSION}.tgz" -C ${INSTALL_DIR} . +echo "Artifacts are here" +ls ${INSTALL_DIR} +find . -name "DLTViewer*.dmg" +find . -name "DLTViewer.*" +# +#mkdir -p dist +#cp ../scripts/darwin/install.md dist +#tar -czvf "dist/DLTViewer-${FULL_VERSION}.tgz" -C "${INSTALL_DIR}" .