chore(ci): Move GHA for OCI Spec outside of workflow dispatcher

Signed-off-by: jay-dee7 <[email protected]>
containerish · Nov 17, 2023 · 5778cc8 · 5778cc8
1 parent 478ed4a
commit 5778cc8
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 48 deletions.
diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -1,6 +1,6 @@
 name: golangci-lint
 on:
-  workflow_call:
+  pull_request:
 
 concurrency:
   group: linter-${{ github.workflow }}-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/oci-dist-spec-content-discovery.yml b/.github/workflows/oci-dist-spec-content-discovery.yml
@@ -1,7 +1,8 @@
 name: OCI Distribution Spec
 
 on:
-  workflow_call:
+  pull_request:
+  workflow_dispatch:
     inputs:
       debug_enabled:
         type: boolean
@@ -10,7 +11,7 @@ on:
         default: false
 
 concurrency:
-  group: content-discovery-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: push-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 env:
@@ -20,7 +21,7 @@ env:
   POSTGRES_USER: postgres
 
 jobs:
-  content-discovery:
+  Content-discovery:
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -38,7 +39,7 @@ jobs:
         ports:
           - 5432:5432
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
@@ -70,6 +71,7 @@ jobs:
       - name: Run OCI Distribution Spec conformance tests
         if: always()
         run: |
+          cd ../
           git clone https://github.com/opencontainers/distribution-spec.git
           pushd distribution-spec/conformance
           git checkout v1.1.0-rc.3
@@ -97,4 +99,4 @@ jobs:
         with:
           name: oci-distribution-content-discovery-report-${{ steps.vars.outputs.short_commit_hash }}
           path: .out/
-        if: always()
+        if: success()
diff --git a/.github/workflows/oci-dist-spec-content-management.yml b/.github/workflows/oci-dist-spec-content-management.yml
@@ -1,7 +1,8 @@
 name: OCI Distribution Spec
 
 on:
-  workflow_call:
+  pull_request:
+  workflow_dispatch:
     inputs:
       debug_enabled:
         type: boolean
@@ -20,7 +21,7 @@ env:
   POSTGRES_USER: postgres
 
 jobs:
-  content-management:
+  Content-management:
     runs-on: ubuntu-latest
     services:
       postgres:

diff --git a/.github/workflows/oci-dist-spec-pull.yml b/.github/workflows/oci-dist-spec-pull.yml
@@ -1,7 +1,8 @@
 name: OCI Distribution Spec
 
 on:
-  workflow_call:
+  pull_request:
+  workflow_dispatch:
     inputs:
       debug_enabled:
         type: boolean
@@ -20,7 +21,7 @@ env:
   POSTGRES_USER: postgres
 
 jobs:
-  pull:
+  Pull:
     runs-on: ubuntu-latest
     services:
       postgres:

diff --git a/.github/workflows/oci-dist-spec-push.yml b/.github/workflows/oci-dist-spec-push.yml
@@ -1,7 +1,8 @@
 name: OCI Distribution Spec
 
 on:
-  workflow_call:
+  pull_request:
+  workflow_dispatch:
     inputs:
       debug_enabled:
         type: boolean
@@ -20,7 +21,7 @@ env:
   POSTGRES_USER: postgres
 
 jobs:
-  push:
+  Push:
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -100,7 +101,4 @@ jobs:
           path: |
             /home/runner/work/OpenRegistry/distribution-spec/conformance/report.html
             /home/runner/work/OpenRegistry/distribution-spec/conformance/junit.xml
-        if: always()
-      - name: Update Status Badge
-        if: ${{ success() }}
-        run: echo "::set-output name=status::success"
+        if: success()