From 08b1816af23f43a80884ec8383d2f7e2d3289c70 Mon Sep 17 00:00:00 2001 From: minotti_c Date: Fri, 29 Apr 2022 17:39:58 +0200 Subject: [PATCH 1/8] Add ssh key option --- .../workflows/reusable.build-deploy-scicat-component.yml | 6 ++++++ .github/workflows/reusable.changes.yml | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/.github/workflows/reusable.build-deploy-scicat-component.yml b/.github/workflows/reusable.build-deploy-scicat-component.yml index 18434b8..3e72b38 100644 --- a/.github/workflows/reusable.build-deploy-scicat-component.yml +++ b/.github/workflows/reusable.build-deploy-scicat-component.yml @@ -36,6 +36,11 @@ on: JSON_SECRETS: description: other secrets in json format required: false + SSH_PRIVATE_KEY: + description: ssh key to private submodule + false: true + default: '' + ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} jobs: @@ -49,6 +54,7 @@ jobs: uses: actions/checkout@v2 with: submodules: recursive + ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: Log in to the Container registry uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 diff --git a/.github/workflows/reusable.changes.yml b/.github/workflows/reusable.changes.yml index 9b92502..c4b069a 100644 --- a/.github/workflows/reusable.changes.yml +++ b/.github/workflows/reusable.changes.yml @@ -10,6 +10,12 @@ on: changed: description: boolean to check if changes on input files value: ${{ jobs.changed.outputs.changed }} + secrets: + SSH_PRIVATE_KEY: + description: ssh key to private submodule + false: true + default: '' + jobs: @@ -25,6 +31,7 @@ jobs: with: submodules: recursive fetch-depth: 0 + ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: Get changed files id: changed-files From ca7b1538bd7634915b5d3cdcb3b0c3639d24b1f0 Mon Sep 17 00:00:00 2001 From: minotti_c Date: Fri, 29 Apr 2022 17:41:20 +0200 Subject: [PATCH 2/8] Fix error --- .github/workflows/reusable.build-deploy-scicat-component.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/reusable.build-deploy-scicat-component.yml b/.github/workflows/reusable.build-deploy-scicat-component.yml index 3e72b38..920f355 100644 --- a/.github/workflows/reusable.build-deploy-scicat-component.yml +++ b/.github/workflows/reusable.build-deploy-scicat-component.yml @@ -40,7 +40,6 @@ on: description: ssh key to private submodule false: true default: '' - ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} jobs: From 7eb5cf7148711b46165b63128ac39c655364687c Mon Sep 17 00:00:00 2001 From: minotti_c Date: Fri, 29 Apr 2022 17:41:46 +0200 Subject: [PATCH 3/8] Remove space --- .github/workflows/reusable.changes.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/reusable.changes.yml b/.github/workflows/reusable.changes.yml index c4b069a..3dd5dfc 100644 --- a/.github/workflows/reusable.changes.yml +++ b/.github/workflows/reusable.changes.yml @@ -17,7 +17,6 @@ on: default: '' - jobs: changed: From 2e2aedc992f121fef58ca3b953c723fb12354053 Mon Sep 17 00:00:00 2001 From: minotti_c Date: Fri, 29 Apr 2022 17:42:08 +0200 Subject: [PATCH 4/8] Remove space --- .github/workflows/reusable.changes.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/reusable.changes.yml b/.github/workflows/reusable.changes.yml index 3dd5dfc..040a083 100644 --- a/.github/workflows/reusable.changes.yml +++ b/.github/workflows/reusable.changes.yml @@ -16,7 +16,6 @@ on: false: true default: '' - jobs: changed: From 3a969b89d793b3098f6fdbe7d88d35c1df5a01b6 Mon Sep 17 00:00:00 2001 From: minotti_c Date: Fri, 29 Apr 2022 17:42:53 +0200 Subject: [PATCH 5/8] Fix key --- .github/workflows/reusable.build-deploy-scicat-component.yml | 2 +- .github/workflows/reusable.changes.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable.build-deploy-scicat-component.yml b/.github/workflows/reusable.build-deploy-scicat-component.yml index 920f355..f59059c 100644 --- a/.github/workflows/reusable.build-deploy-scicat-component.yml +++ b/.github/workflows/reusable.build-deploy-scicat-component.yml @@ -38,7 +38,7 @@ on: required: false SSH_PRIVATE_KEY: description: ssh key to private submodule - false: true + required: true default: '' jobs: diff --git a/.github/workflows/reusable.changes.yml b/.github/workflows/reusable.changes.yml index 040a083..7639ff6 100644 --- a/.github/workflows/reusable.changes.yml +++ b/.github/workflows/reusable.changes.yml @@ -13,7 +13,7 @@ on: secrets: SSH_PRIVATE_KEY: description: ssh key to private submodule - false: true + required: true default: '' jobs: From eb6453373734a51872c6024269a4c5be2eb67bff Mon Sep 17 00:00:00 2001 From: minotti_c Date: Fri, 29 Apr 2022 17:43:15 +0200 Subject: [PATCH 6/8] Fix value --- .github/workflows/reusable.build-deploy-scicat-component.yml | 2 +- .github/workflows/reusable.changes.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable.build-deploy-scicat-component.yml b/.github/workflows/reusable.build-deploy-scicat-component.yml index f59059c..5166525 100644 --- a/.github/workflows/reusable.build-deploy-scicat-component.yml +++ b/.github/workflows/reusable.build-deploy-scicat-component.yml @@ -38,7 +38,7 @@ on: required: false SSH_PRIVATE_KEY: description: ssh key to private submodule - required: true + required: false default: '' jobs: diff --git a/.github/workflows/reusable.changes.yml b/.github/workflows/reusable.changes.yml index 7639ff6..221b139 100644 --- a/.github/workflows/reusable.changes.yml +++ b/.github/workflows/reusable.changes.yml @@ -13,7 +13,7 @@ on: secrets: SSH_PRIVATE_KEY: description: ssh key to private submodule - required: true + required: false default: '' jobs: From fb526645b735e735a7f2fb9fc81b294a4000a988 Mon Sep 17 00:00:00 2001 From: minotti_c Date: Mon, 2 May 2022 09:25:11 +0200 Subject: [PATCH 7/8] Remove default to secret and set as optional --- .github/workflows/reusable.changes.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/reusable.changes.yml b/.github/workflows/reusable.changes.yml index 221b139..fb565bd 100644 --- a/.github/workflows/reusable.changes.yml +++ b/.github/workflows/reusable.changes.yml @@ -14,7 +14,6 @@ on: SSH_PRIVATE_KEY: description: ssh key to private submodule required: false - default: '' jobs: changed: From 1ac5456517957e677832d1859d6be7a1cc257674 Mon Sep 17 00:00:00 2001 From: minotti_c Date: Mon, 2 May 2022 09:27:35 +0200 Subject: [PATCH 8/8] Remove all defaults --- .github/workflows/reusable.build-deploy-scicat-component.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/reusable.build-deploy-scicat-component.yml b/.github/workflows/reusable.build-deploy-scicat-component.yml index 5166525..5747178 100644 --- a/.github/workflows/reusable.build-deploy-scicat-component.yml +++ b/.github/workflows/reusable.build-deploy-scicat-component.yml @@ -39,7 +39,6 @@ on: SSH_PRIVATE_KEY: description: ssh key to private submodule required: false - default: '' jobs: