diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 7268a76c0e..7f2eccfb32 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -111,13 +111,12 @@ jobs: owtools: ${{ matrix.owtools }} image: ${{ matrix.image }} owdebug: ${{ vars.OWDEBUG }} - snapshot-pull: + snapshot-both: needs: - workflow-lnx - workflow-nt - workflow-osx - if: github.event_name == 'PullRequest' - name: CI Pull Request Artifact + name: CI Release runs-on: ubuntu-latest steps: - name: checkout @@ -137,45 +136,15 @@ jobs: arch: 'lnx' gitpath: 'rel' owdebug: ${{ vars.OWDEBUG }} - - name: Upload Artifact owsnapshot + - if: github.event_name == 'PullRequest' + name: Upload Artifact owsnapshot uses: actions/upload-artifact@v4 with: name: 'owsnapshot' path: ${{ steps.owsnapshot.outputs.fullname }} retention-days: 10 - - name: Call to delete Artifacs - uses: "./.github/actions/artfdelc" - with: - exclude: 'owsnapshot' - owdebug: ${{ vars.OWDEBUG }} - owcurlopts: ${{ vars.OWCURLOPTS }} - snapshot-push: - needs: - - workflow-lnx - - workflow-nt - - workflow-osx - if: github.event_name != 'PullRequest' - name: CI Release - runs-on: ubuntu-latest - steps: - - name: checkout - uses: actions/checkout@v4 - - name: Load all release files - uses: "./.github/actions/relload" - with: - arch: 'lnx' - gitpath: 'rel' - tools_nt: 'vs2019' - tools_lnx: 'gcc' - owdebug: ${{ vars.OWDEBUG }} - - name: Create OW snapshot - id: owsnapshot - uses: "./.github/actions/snapshot" - with: - arch: 'lnx' - gitpath: 'rel' - owdebug: ${{ vars.OWDEBUG }} - - name: Last CI Build + - if: github.event_name != 'PullRequest' + name: Upload Last CI Build uses: "./.github/actions/lastbld" with: arch: 'lnx' @@ -183,7 +152,15 @@ jobs: fullname: ${{ steps.owsnapshot.outputs.fullname }} owdebug: ${{ vars.OWDEBUG }} owcurlopts: ${{ vars.OWCURLOPTS }} - - name: Call to delete Artifacs + - if: github.event_name == 'PullRequest' + name: Call to delete Artifacs + uses: "./.github/actions/artfdelc" + with: + exclude: 'owsnapshot' + owdebug: ${{ vars.OWDEBUG }} + owcurlopts: ${{ vars.OWCURLOPTS }} + - if: github.event_name != 'PullRequest' + name: Call to delete Artifacs uses: "./.github/actions/artfdelc" with: owdebug: ${{ vars.OWDEBUG }}