@@ -456,40 +456,39 @@ jobs:
456
456
chown -R opam "${GITHUB_OUTPUT}"
457
457
sudo -u opam -E ./.github/scripts/build-apk.sh ${{ needs.build_details.outputs.branch }} ${{ matrix.os }} ${{ matrix.platform }} ${{ matrix.alpine-arch }} "${{ needs.build_details.outputs.is_rolling_release }}" "${{ needs.build_details.outputs.is_release }}" "${{ needs.build_details.outputs.minimal_exclude_deps }}"
458
458
- name : Upload alpine packages artifacts
459
- if : needs.build_details.outputs.is_fork != 'true' && matrix.os == 'alpine'
460
- uses : savonet/aws-s3-docker-action@master
459
+ if : contains( matrix.os, 'alpine')
460
+ uses : actions/upload-artifact@v4
461
461
env :
462
- AWS_ACCESS_KEY_ID : ${{ secrets.AWS_ACCESS_KEY_ID }}
463
- AWS_SECRET_ACCESS_KEY : ${{ secrets.AWS_SECRET_ACCESS_KEY }}
464
- SOURCE : ${{ github.workspace }}/${{ github.run_number }}/${{ matrix.os }}_${{ matrix.platform }}/alpine
465
- TARGET : ${{ needs.build_details.outputs.s3-artifact-basepath }}
462
+ name : ${{ steps.build_apk.outputs.basename }}
463
+ path : ${{ github.workspace }}/${{ github.run_number }}/${{ matrix.os }}_${{ matrix.platform }}/alpine
464
+ if-no-files-found : error
466
465
- name : Cleanup
467
466
if : ${{ always() }}
468
467
run : |
469
468
rm -rf /tmp/${{ github.run_number }}/${{ matrix.os }}_${{ matrix.platform }}
470
469
471
- fetch_s3_artifacts :
472
- runs-on : ubuntu-latest
473
- needs : [build_details, build_posix]
474
- steps :
475
- - name : Prepare directory
476
- run : |
477
- rm -rf ${{ github.workspace }}/${{ github.run_number }}/s3-artifacts
478
- mkdir -p ${{ github.workspace }}/${{ github.run_number }}/s3-artifacts
479
- - name : Fetch S3 artifacts
480
- if : needs.build_details.outputs.is_fork != 'true'
481
- uses : savonet/aws-s3-docker-action@master
482
- env :
483
- AWS_ACCESS_KEY_ID : ${{ secrets.AWS_ACCESS_KEY_ID }}
484
- AWS_SECRET_ACCESS_KEY : ${{ secrets.AWS_SECRET_ACCESS_KEY }}
485
- SOURCE : ${{ needs.build_details.outputs.s3-artifact-basepath }}
486
- TARGET : ${{ github.workspace }}/${{ github.run_number }}/s3-artifacts
487
- - name : Upload S3 artifacts
488
- uses : actions/upload-artifact@v4
489
- if : needs.build_details.outputs.is_fork != 'true'
490
- with :
491
- name : alpine-packages
492
- path : ${{ github.workspace }}/${{ github.run_number }}/s3-artifacts
470
+ # fetch_s3_artifacts:
471
+ # runs-on: ubuntu-latest
472
+ # needs: [build_details, build_posix]
473
+ # steps:
474
+ # - name: Prepare directory
475
+ # run: |
476
+ # rm -rf ${{ github.workspace }}/${{ github.run_number }}/s3-artifacts
477
+ # mkdir -p ${{ github.workspace }}/${{ github.run_number }}/s3-artifacts
478
+ # - name: Fetch S3 artifacts
479
+ # if: needs.build_details.outputs.is_fork != 'true'
480
+ # uses: savonet/aws-s3-docker-action@master
481
+ # env:
482
+ # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
483
+ # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
484
+ # SOURCE: ${{ needs.build_details.outputs.s3-artifact-basepath }}
485
+ # TARGET: ${{ github.workspace }}/${{ github.run_number }}/s3-artifacts
486
+ # - name: Upload S3 artifacts
487
+ # uses: actions/upload-artifact@v4
488
+ # if: needs.build_details.outputs.is_fork != 'true'
489
+ # with:
490
+ # name: alpine-packages
491
+ # path: ${{ github.workspace }}/${{ github.run_number }}/s3-artifacts
493
492
494
493
build_win32 :
495
494
runs-on : depot-ubuntu-22.04-4
@@ -551,7 +550,6 @@ jobs:
551
550
run_tests,
552
551
build_posix,
553
552
build_win32,
554
- fetch_s3_artifacts,
555
553
]
556
554
if : needs.build_details.outputs.is_release
557
555
steps :
@@ -615,7 +613,7 @@ jobs:
615
613
616
614
build_docker :
617
615
runs-on : ${{ matrix.runs-on }}
618
- needs : [build_details, build_posix, fetch_s3_artifacts ]
616
+ needs : [build_details, build_posix]
619
617
strategy :
620
618
fail-fast : false
621
619
matrix :
@@ -666,7 +664,7 @@ jobs:
666
664
667
665
build_docker_alpine :
668
666
runs-on : ${{ matrix.runs-on }}
669
- needs : [build_details, build_posix, fetch_s3_artifacts ]
667
+ needs : [build_details, build_posix]
670
668
strategy :
671
669
fail-fast : false
672
670
matrix :
@@ -712,7 +710,7 @@ jobs:
712
710
713
711
build_docker_minimal :
714
712
runs-on : ${{ matrix.runs-on }}
715
- needs : [build_details, build_posix, fetch_s3_artifacts ]
713
+ needs : [build_details, build_posix]
716
714
strategy :
717
715
fail-fast : false
718
716
matrix :
@@ -763,7 +761,7 @@ jobs:
763
761
764
762
build_docker_alpine_minimal :
765
763
runs-on : ${{ matrix.runs-on }}
766
- needs : [build_details, build_posix, fetch_s3_artifacts ]
764
+ needs : [build_details, build_posix]
767
765
strategy :
768
766
fail-fast : false
769
767
matrix :
0 commit comments