fix delete artifact processing

open-watcom · Feb 4, 2024 · 90d2e0a · 90d2e0a
1 parent 0c68f22
commit 90d2e0a
Showing 1 changed file with 15 additions and 38 deletions.
diff --git 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,53 +136,31 @@ 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'
         tools:      'gcc'
         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 }}