wip

AntelopeIO · Oct 2, 2023 · a082069 · a082069
1 parent eee0fd6
commit a082069
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 126 deletions.
diff --git a/.cicd/platforms.json b/.cicd/platforms.json
diff --git a/.github/workflows/performance_harness_run.yaml b/.github/workflows/performance_harness_run.yaml
@@ -9,6 +9,7 @@ on:
         options:
         - ubuntu20
         - ubuntu22
+        - reproducible
       override-test-params:
         description: 'Override perf harness params'
         type: string
@@ -38,21 +39,21 @@ jobs:
             echo test-params=${{inputs.override-test-params}} >> $GITHUB_OUTPUT
           fi
 
-  platforms:
-    name: Run Platforms Workflow
-    uses: ./.github/workflows/platforms.yaml
-    with:
-      override-build-matrix: ${{github.event.inputs.platform-choice}}
+  platform-cache:
+    name: Platform Cache
+    uses: AntelopeIO/platform-cache-workflow/.github/workflows/platformcache.yaml@main
     permissions:
-      packages: write
       contents: read
+      packages: write
+    with:
+      runs-on: '["self-hosted", "enf-x86-beefy"]'
+      platform-files: |
+        .cicd/platforms
+        tools/reproducible.Dockerfile:builder
 
   reuse-build:
     name: Reuse leap build
     needs: [v]
-    if: |
-      always() &&
-      needs.v.result == 'success'
     runs-on: ubuntu-latest
     outputs:
       build-artifact: ${{steps.downloadBuild.outputs.downloaded-file}}
@@ -77,23 +78,20 @@ jobs:
 
   build-base:
     name: Run Build Workflow
-    needs: [platforms, reuse-build]
-    if: always() && needs.platforms.result == 'success' && needs.reuse-build.outputs.build-artifact == ''
+    needs: [platforms-cache, reuse-build]
+    if: needs.reuse-build.outputs.build-artifact == ''
     uses: ./.github/workflows/build_base.yaml
     with:
-      p: ${{needs.platforms.outputs.p}}
-      platform-matrix: ${{needs.platforms.outputs.platform-matrix}}
-    permissions:
-      packages: write
-      contents: read
+      platforms: ${{needs.platform-cache.outputs.platforms}}
+      platform-list: [${{github.event.inputs.platform-choice}}]
 
   tests:
     name: Tests
-    needs: [v, platforms, reuse-build, build-base]
-    if: always() && needs.platforms.result == 'success' && (needs.build-base.result == 'success' || needs.reuse-build.result == 'success')
+    needs: [v, platform-cache, reuse-build, build-base]
+    if: always() && (needs.build-base.result == 'success' || needs.reuse-build.result == 'success')
     runs-on: ubuntu-latest
     container:
-      image: ${{fromJSON(needs.platforms.outputs.p)[github.event.inputs.platform-choice].image}}
+      image: ${{fromJSON(needs.platform-cache.outputs.platforms)[github.event.inputs.platform-choice].image}}
     steps:
       - name: Download builddir
         uses: actions/download-artifact@v3

diff --git a/.github/workflows/ph_backward_compatibility.yaml b/.github/workflows/ph_backward_compatibility.yaml
@@ -12,36 +12,40 @@ defaults:
     shell: bash
 
 jobs:
-  platforms:
-    name: Run Platforms Workflow
-    uses: ./.github/workflows/platforms.yaml
+  platform-cache:
+    name: Platform Cache
+    uses: AntelopeIO/platform-cache-workflow/.github/workflows/platformcache.yaml@main
     permissions:
-      packages: write
       contents: read
+      packages: write
+    with:
+      runs-on: '["self-hosted", "enf-x86-beefy"]'
+      platform-files: |
+        .cicd/platforms
+        tools/reproducible.Dockerfile:builder
 
   build-base:
     name: Run Build Workflow
     uses: ./.github/workflows/build_base.yaml
-    needs: [platforms]
+    needs: [platform-cache]
     with:
-      p: ${{needs.platforms.outputs.p}}
-      platform-matrix: ${{needs.platforms.outputs.platform-matrix}}
+      platforms: ${{needs.platform-cache.outputs.platforms}}
+      platform-list: ${{needs.platform-cache.outputs.platforms}}
     permissions:
       packages: write
       contents: read
 
   tests:
     name: Tests
-    needs: [platforms, build-base]
-    if: always() && needs.platforms.result == 'success' && needs.build-base.result == 'success'
+    needs: [platform-cache, build-base]
     strategy:
       fail-fast: false
       matrix:
-        platform: ${{fromJSON(needs.platforms.outputs.platform-matrix)}}
+        platform: ${{fromJSON(needs.platform-cache.outputs.platform-list)}}
         release: [3.1, 3.2, 4.0]
     runs-on: ["self-hosted", "enf-x86-lowtier"]
     container:
-      image: ${{fromJSON(needs.platforms.outputs.p)[matrix.platform].image}}
+      image: ${{fromJSON(needs.platform-cache.outputs.platforms)[matrix.platform].image}}
       options: --security-opt seccomp=unconfined
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/platforms.yaml b/.github/workflows/platforms.yaml