Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preventing nested zipping of the portable Windows build #7950

Merged
merged 16 commits into from
Jan 23, 2025
Merged

Preventing nested zipping of the portable Windows build #7950

Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
22b24fc
Update build_orca.yml
discip Jan 7, 2025
e5dcb01
Merge branch 'SoftFever:main' into patch-3
discip Jan 7, 2025
3557d1f
Merge branch 'main' into patch-3
discip Jan 8, 2025
887f768
Merge branch 'main' into patch-3
discip Jan 8, 2025
0f27015
Merge branch 'main' into patch-3
discip Jan 8, 2025
25ab601
Merge branch 'main' into patch-3
discip Jan 13, 2025
dfa5d37
Merge branch 'main' into patch-3
discip Jan 13, 2025
6bd950b
Merge branch 'main' into patch-3
discip Jan 15, 2025
87a5b40
Merge branch 'SoftFever:main' into patch-3
discip Jan 20, 2025
f450a76
Merge branch 'SoftFever:main' into patch-3
discip Jan 21, 2025
1788a71
Merge branch 'SoftFever:main' into patch-3
discip Jan 22, 2025
4e86be0
Merge branch 'SoftFever:main' into patch-3
discip Jan 22, 2025
0dad883
Update build_orca.yml
discip Jan 23, 2025
2817ceb
Merge branch 'main' into patch-3
discip Jan 23, 2025
e4414f7
uncommented lines 180-184
discip Jan 23, 2025
024c3bc
Merge branch 'main' into patch-3
discip Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build_orca.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ jobs:
run: |
cpack -G NSIS

- name: Pack app
if: inputs.os == 'windows-latest'
working-directory: ${{ github.workspace }}/build
shell: cmd
run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_Windows_${{ env.ver }}_portable.zip ${{ github.workspace }}/build/OrcaSlicer'
# - name: Pack app
# if: inputs.os == 'windows-latest'
# working-directory: ${{ github.workspace }}/build
# shell: cmd
# run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_Windows_${{ env.ver }}_portable.zip ${{ github.workspace }}/build/OrcaSlicer'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you have to uncomment these part otherwise the zip file doesn't exist.

Copy link
Contributor Author

@discip discip Jan 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the thing.
If this is uncommented the files get zipped the 1st time and than it gets zipped the second time with this:

      - name: Upload artifacts Win zip
        if: inputs.os == 'windows-latest'
        uses: actions/upload-artifact@v4
        with:
          name: OrcaSlicer_Windows_${{ env.ver }}_portable
          path: ${{ github.workspace }}/build/OrcaSlicer

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as Path points to the dir not the zip it should be fine.


- name: Pack PDB
if: inputs.os == 'windows-latest'
Expand All @@ -194,7 +194,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: OrcaSlicer_Windows_${{ env.ver }}_portable
path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
path: ${{ github.workspace }}/build/OrcaSlicer
discip marked this conversation as resolved.
Show resolved Hide resolved

- name: Upload artifacts Win installer
if: inputs.os == 'windows-latest'
Expand Down
Loading