amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

CICD: was uploading wrong zip file

Browse source
This commit is contained in:
SoftFever 2023-03-16 01:29:29 +08:00
parent dfa5d42d84
commit c2827e3161
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build_mac_arm64.yml vendored
View file

@ -72,7 +72,7 @@ jobs:
- name: pack app
working-directory: ${{ github.workspace }}
run: |
export ver=$(grep '^#define SoftFever_VERSION' ./src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
export ver=$(grep '^#define SoftFever_VERSION' ./build_arm64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
ver="_V${ver//\"}"
zip -FSr OrcaSlicer${ver}_nightly_Mac_AppleSilicon.zip ${{ github.workspace }}/build_arm64/OrcaSlicer_arm64/OrcaSlicer.app
@ -89,4 +89,4 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: OrcaSlicer_Mac_AppleSilicon
path: ${{ github.workspace }}/build_arm64/OrcaSlicer_arm64/OrcaSlicer*.zip
path: ${{ github.workspace }}/OrcaSlicer*.zip

4
.github/workflows/build_mac_x64.yml vendored
View file

@ -73,7 +73,7 @@ jobs:
- name: pack app
working-directory: ${{ github.workspace }}
run: |
export ver=$(grep '^#define SoftFever_VERSION' ./src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
export ver=$(grep '^#define SoftFever_VERSION' ./build_x86_64/src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
ver="_V${ver//\"}"
zip -FSr OrcaSlicer${ver}_nightly_Mac_Intel.zip ${{ github.workspace }}/build_x86_64/OrcaSlicer_x86_64/OrcaSlicer.app
@ -90,4 +90,4 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: OrcaSlicer_Mac_Intel
path: ${{ github.workspace }}/build_x86_64/OrcaSlicer_x86_64/OrcaSlicer*.zip
path: ${{ github.workspace }}/OrcaSlicer*.zip

16
build_release_macos.sh
View file

@ -88,13 +88,13 @@ cp -R $resources_path ./OrcaSlicer.app/Contents/Resources
# delete .DS_Store file
find ./OrcaSlicer.app/ -name '.DS_Store' -delete
# extract version
export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
ver="_V${ver//\"}"
echo $PWD
if [ "1." != "$NIGHTLY_BUILD". ];
then
ver=${ver}_dev
fi
# export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
# ver="_V${ver//\"}"
# echo $PWD
# if [ "1." != "$NIGHTLY_BUILD". ];
# then
# ver=${ver}_dev
# fi
zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app
# zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app