git.delta.rocks / unique-network / refs/commits / ac9b5eeb31df

difftreelog

Merge pull request #918 from UniqueNetwork/ci/fix-workflows

Yaroslav Bolyukin2023-04-14parents: #e02f22f #e69c3de.patch.diff
in: master
Ci/fix workflows

3 files changed

modified.github/workflows/ci-develop.ymldiffbeforeafterboth
41    uses: ./.github/workflows/collator-selection.yml41    uses: ./.github/workflows/collator-selection.yml
42    secrets: inherit    42    secrets: inherit    
43    43    
44  # forkless:
45  #   if: ${{ (github.event.pull_request.draft == false && contains( github.event.pull_request.labels.*.name, 'CI-forkless')) }}  # Conditional check for draft & labels per job.
46  #   uses: ./.github/workflows/forkless.yml
47  #   secrets: inherit    
48
49  forkless-update-data:44  forkless-update-data:
50    if: ${{ (github.event.pull_request.draft == false && contains( github.event.pull_request.labels.*.name, 'CI-forkless')) }}  # Conditional check for draft & labels per job.  45    if: ${{ (github.event.pull_request.draft == false && contains( github.event.pull_request.labels.*.name, 'CI-forkless')) }}  # Conditional check for draft & labels per job.
modified.github/workflows/ci-master.ymldiffbeforeafterboth
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -18,15 +18,11 @@
 
   yarn-dev:
     uses: ./.github/workflows/yarn-dev.yml
+    secrets: inherit    
 
   unit-test:
     uses: ./.github/workflows/unit-test.yml
-
-  node-only-update:
-    uses: ./.github/workflows/node-only-update.yml
-
-  forkless:
-    uses: ./.github/workflows/forkless.yml
+    secrets: inherit    
 
   # canary:
   #   uses: ./.github/workflows/canary.yml
@@ -38,13 +34,30 @@
     
   collator-selection:
     uses: ./.github/workflows/collator-selection.yml
+    secrets: inherit    
 
-  # testnet:
-  #   uses: ./.github/workflows/testnet-build.yml
-  #   secrets: inherit # pass all secrets from initial workflow to nested
+  forkless-update-data:
+    uses: ./.github/workflows/forkless-update-data.yml
+    secrets: inherit # pass all secrets from initial workflow to nested    
 
+  forkless-update-no-data:
+    uses: ./.github/workflows/forkless-update-nodata.yml
+    secrets: inherit # pass all secrets from initial workflow to nested    
+
+  try-runtime:
+    uses: ./.github/workflows/try-runtime.yml
+    secrets: inherit # pass all secrets from initial workflow to nested    
+
+  node-only-update:
+    uses: ./.github/workflows/node-only-update.yml
+    secrets: inherit
+
   codestyle:
     uses: ./.github/workflows/codestyle.yml
+    secrets: inherit
 
   polkadot-types:
-    uses: ./.github/workflows/polkadot-types.yml
\ No newline at end of file
+    uses: ./.github/workflows/polkadot-types.yml
+
+
+    
\ No newline at end of file
deleted.github/workflows/forkless.ymldiffbeforeafterboth
--- a/.github/workflows/forkless.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Intermediate Nested Workflow for calling subworkflows as a parallel tasks.
-
-# name: Nesting Forkless
-
-# on:
-#   workflow_call:
-
-# jobs:
-    
-#   forkless-update-data:
-#     name: with data
-#     uses: ./.github/workflows/forkless-update-data.yml
-#     secrets: inherit # pass all secrets from initial workflow to nested    
-
-#   forkless-update-no-data:
-#     name: no data
-#     uses: ./.github/workflows/forkless-update-nodata.yml
-#     secrets: inherit # pass all secrets from initial workflow to nested    
-
-#   try-runtime:
-#     name: try-runtime
-#     uses: ./.github/workflows/try-runtime.yml
-#     secrets: inherit # pass all secrets from initial workflow to nested