Commit 689a093e328a5f1ab1ff82a55193c79fb474b4ea
1 parent
62cc38b4
Upgrade artifacts actions
Showing
1 changed file
with
25 additions
and
12 deletions
.github/workflows/main.yml
| @@ -28,19 +28,19 @@ jobs: | @@ -28,19 +28,19 @@ jobs: | ||
| 28 | - name: 'Run pre-build steps' | 28 | - name: 'Run pre-build steps' |
| 29 | run: build-scripts/prebuild ${{ secrets.GITHUB_TOKEN }} | 29 | run: build-scripts/prebuild ${{ secrets.GITHUB_TOKEN }} |
| 30 | - name: 'Upload documentation for later build steps' | 30 | - name: 'Upload documentation for later build steps' |
| 31 | - uses: actions/upload-artifact@v3 | 31 | + uses: actions/upload-artifact@v4 |
| 32 | with: | 32 | with: |
| 33 | name: doc | 33 | name: doc |
| 34 | path: doc.zip | 34 | path: doc.zip |
| 35 | - name: 'Upload external libs' | 35 | - name: 'Upload external libs' |
| 36 | - uses: actions/upload-artifact@v3 | 36 | + uses: actions/upload-artifact@v4 |
| 37 | with: | 37 | with: |
| 38 | name: external-libs | 38 | name: external-libs |
| 39 | path: external-libs-dist | 39 | path: external-libs-dist |
| 40 | - name: 'Upload doc distribution' | 40 | - name: 'Upload doc distribution' |
| 41 | - uses: actions/upload-artifact@v3 | 41 | + uses: actions/upload-artifact@v4 |
| 42 | with: | 42 | with: |
| 43 | - name: distribution | 43 | + name: distribution-prebuild |
| 44 | path: distribution | 44 | path: distribution |
| 45 | Linux: | 45 | Linux: |
| 46 | runs-on: ubuntu-latest | 46 | runs-on: ubuntu-latest |
| @@ -49,9 +49,9 @@ jobs: | @@ -49,9 +49,9 @@ jobs: | ||
| 49 | - name: 'Generate, build, and test' | 49 | - name: 'Generate, build, and test' |
| 50 | run: build-scripts/build-linux | 50 | run: build-scripts/build-linux |
| 51 | - name: Upload distribution | 51 | - name: Upload distribution |
| 52 | - uses: actions/upload-artifact@v3 | 52 | + uses: actions/upload-artifact@v4 |
| 53 | with: | 53 | with: |
| 54 | - name: distribution | 54 | + name: distribution-linux |
| 55 | path: distribution | 55 | path: distribution |
| 56 | Windows: | 56 | Windows: |
| 57 | runs-on: windows-latest | 57 | runs-on: windows-latest |
| @@ -68,12 +68,12 @@ jobs: | @@ -68,12 +68,12 @@ jobs: | ||
| 68 | run: git config --global core.autocrlf input | 68 | run: git config --global core.autocrlf input |
| 69 | - uses: actions/checkout@v4 | 69 | - uses: actions/checkout@v4 |
| 70 | - name: 'Download documentation' | 70 | - name: 'Download documentation' |
| 71 | - uses: actions/download-artifact@v3 | 71 | + uses: actions/download-artifact@v4 |
| 72 | with: | 72 | with: |
| 73 | name: doc | 73 | name: doc |
| 74 | path: . | 74 | path: . |
| 75 | - name: 'Download external libs' | 75 | - name: 'Download external libs' |
| 76 | - uses: actions/download-artifact@v3 | 76 | + uses: actions/download-artifact@v4 |
| 77 | with: | 77 | with: |
| 78 | name: external-libs | 78 | name: external-libs |
| 79 | path: . | 79 | path: . |
| @@ -81,9 +81,9 @@ jobs: | @@ -81,9 +81,9 @@ jobs: | ||
| 81 | shell: cmd | 81 | shell: cmd |
| 82 | run: build-scripts/build-windows.bat ${{ matrix.wordsize }} ${{ matrix.tool }} | 82 | run: build-scripts/build-windows.bat ${{ matrix.wordsize }} ${{ matrix.tool }} |
| 83 | - name: 'Upload binary distributions' | 83 | - name: 'Upload binary distributions' |
| 84 | - uses: actions/upload-artifact@v3 | 84 | + uses: actions/upload-artifact@v4 |
| 85 | with: | 85 | with: |
| 86 | - name: distribution | 86 | + name: distribution-windows-${{ matrix.wordsize }}-${{ matrix.tool }} |
| 87 | path: distribution | 87 | path: distribution |
| 88 | macOS: | 88 | macOS: |
| 89 | runs-on: macos-latest | 89 | runs-on: macos-latest |
| @@ -100,9 +100,9 @@ jobs: | @@ -100,9 +100,9 @@ jobs: | ||
| 100 | - name: 'Build AppImage' | 100 | - name: 'Build AppImage' |
| 101 | run: build-scripts/build-appimage | 101 | run: build-scripts/build-appimage |
| 102 | - name: 'Upload AppImage' | 102 | - name: 'Upload AppImage' |
| 103 | - uses: actions/upload-artifact@v3 | 103 | + uses: actions/upload-artifact@v4 |
| 104 | with: | 104 | with: |
| 105 | - name: distribution | 105 | + name: distribution-appimage |
| 106 | path: distribution | 106 | path: distribution |
| 107 | pikepdf: | 107 | pikepdf: |
| 108 | strategy: | 108 | strategy: |
| @@ -152,3 +152,16 @@ jobs: | @@ -152,3 +152,16 @@ jobs: | ||
| 152 | - uses: actions/checkout@v4 | 152 | - uses: actions/checkout@v4 |
| 153 | - name: ${{ matrix.script }} | 153 | - name: ${{ matrix.script }} |
| 154 | run: build-scripts/${{ matrix.script }} | 154 | run: build-scripts/${{ matrix.script }} |
| 155 | + MergeArtifacts: | ||
| 156 | + runs-on: ubuntu-latest | ||
| 157 | + needs: | ||
| 158 | + - Prebuild | ||
| 159 | + - Linux | ||
| 160 | + - Windows | ||
| 161 | + - AppImage | ||
| 162 | + steps: | ||
| 163 | + - name: Merge Artifacts | ||
| 164 | + uses: actions/upload-artifact/merge@v4 | ||
| 165 | + with: | ||
| 166 | + name: distribution | ||
| 167 | + pattern: distribution-* |