From 21b7d838188678a76e86c6fb6a9696e5f51dd56a Mon Sep 17 00:00:00 2001 From: Kathy Tran Date: Fri, 22 Nov 2024 13:55:31 -0500 Subject: [PATCH 1/7] Use reusable deploy --- .github/workflows/deploy_snapshot.yml | 40 +++++---------------------- .github/workflows/deploy_tagged.yml | 14 +++------- 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml index e7faceaef..9ba0a6fc1 100644 --- a/.github/workflows/deploy_snapshot.yml +++ b/.github/workflows/deploy_snapshot.yml @@ -2,39 +2,13 @@ name: Deploy develop snapshot on: push: - branches: - - develop - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: + branches-ignore: + - 'master' + - 'release/**' + - 'hotfix/**' + - 'dependabot/**' jobs: build: - runs-on: ubuntu-22.04 - - steps: - - uses: actions/checkout@v4 - # Step that does that actual cache save and restore - - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - - name: Set up JDK - uses: actions/setup-java@v4 - with: - java-version: '17.0.4+8' - distribution: 'adopt' - - name: install git secrets - run: | - wget --no-verbose -O git-secrets-1.3.0.tar.gz https://github.com/awslabs/git-secrets/archive/1.3.0.tar.gz - tar -zxf git-secrets-1.3.0.tar.gz - cd git-secrets-1.3.0 - sudo make install - - - name: Deploy with mvnw - run: ./mvnw --batch-mode deploy -ntp -s .github/snapshot-mvn-settings.xml -DskipTests - env: - SNAPSHOT_DEPLOY_TOKEN: ${{ secrets.SNAPSHOT_DEPLOY_TOKEN }} + uses: dockstore/workflow-actions/.github/workflows/deploy_snapshot.yaml@seab-6771/reusable-image-deploy + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/deploy_tagged.yml b/.github/workflows/deploy_tagged.yml index 614cd5d6b..f49991232 100644 --- a/.github/workflows/deploy_tagged.yml +++ b/.github/workflows/deploy_tagged.yml @@ -1,17 +1,11 @@ name: Tagged release deploy on: - workflow_dispatch: - inputs: - changelist: - description: 'patch and pre-release metadata' - required: true - default: '.0-alpha.1' - + push: + tags: + - '**' jobs: call-reusable-tagged-release: - uses: dockstore/workflow-actions/.github/workflows/deploy_tagged.yaml@main - with: - changelist: ${{ inputs.changelist }} + uses: dockstore/workflow-actions/.github/workflows/deploy_tagged.yaml@seab-6771/reusable-image-deploy secrets: inherit From 6547cd9b57f74e2c0dbe212a4030745913b13bab Mon Sep 17 00:00:00 2001 From: Kathy Tran Date: Fri, 22 Nov 2024 16:35:46 -0500 Subject: [PATCH 2/7] Add workflow_dispatch for testing --- .github/workflows/deploy_snapshot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml index 9ba0a6fc1..b8e200bf9 100644 --- a/.github/workflows/deploy_snapshot.yml +++ b/.github/workflows/deploy_snapshot.yml @@ -7,6 +7,8 @@ on: - 'release/**' - 'hotfix/**' - 'dependabot/**' + + workflow_dispatch: jobs: build: From c3b4fb5279eeb67fdeb67ca5dc89670203160878 Mon Sep 17 00:00:00 2001 From: Kathy Tran Date: Mon, 25 Nov 2024 10:18:49 -0500 Subject: [PATCH 3/7] Revert "Add workflow_dispatch for testing" This reverts commit 6547cd9b57f74e2c0dbe212a4030745913b13bab. --- .github/workflows/deploy_snapshot.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml index b8e200bf9..9ba0a6fc1 100644 --- a/.github/workflows/deploy_snapshot.yml +++ b/.github/workflows/deploy_snapshot.yml @@ -7,8 +7,6 @@ on: - 'release/**' - 'hotfix/**' - 'dependabot/**' - - workflow_dispatch: jobs: build: From f968c22b5a7198b7a68543f8bcfff404281915c4 Mon Sep 17 00:00:00 2001 From: Kathy Tran Date: Mon, 25 Nov 2024 10:19:25 -0500 Subject: [PATCH 4/7] Fix newline --- .github/workflows/deploy_snapshot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml index 9ba0a6fc1..edcacd6f4 100644 --- a/.github/workflows/deploy_snapshot.yml +++ b/.github/workflows/deploy_snapshot.yml @@ -11,4 +11,4 @@ on: jobs: build: uses: dockstore/workflow-actions/.github/workflows/deploy_snapshot.yaml@seab-6771/reusable-image-deploy - secrets: inherit \ No newline at end of file + secrets: inherit From 6186c34e278d330111b01aa9f00ce2af965ceb26 Mon Sep 17 00:00:00 2001 From: Kathy Tran Date: Mon, 25 Nov 2024 14:01:46 -0500 Subject: [PATCH 5/7] Delete settings.xml files --- .github/collab-mvn-settings.xml | 9 --------- .github/snapshot-mvn-settings.xml | 9 --------- 2 files changed, 18 deletions(-) delete mode 100644 .github/collab-mvn-settings.xml delete mode 100644 .github/snapshot-mvn-settings.xml diff --git a/.github/collab-mvn-settings.xml b/.github/collab-mvn-settings.xml deleted file mode 100644 index 711bbdc0d..000000000 --- a/.github/collab-mvn-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - central - dockstore-bot - ${env.COLLAB_DEPLOY_TOKEN} - - - diff --git a/.github/snapshot-mvn-settings.xml b/.github/snapshot-mvn-settings.xml deleted file mode 100644 index ce26d73be..000000000 --- a/.github/snapshot-mvn-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - snapshots - dockstore-snapshot-bot - ${env.SNAPSHOT_DEPLOY_TOKEN} - - - From 52c0a6b91ba7fe6be5d01b13a6616067770bfdd6 Mon Sep 17 00:00:00 2001 From: Kathy Tran Date: Tue, 26 Nov 2024 15:04:43 -0500 Subject: [PATCH 6/7] Use deploy_artifacts --- .github/workflows/deploy_snapshot.yml | 2 +- .github/workflows/deploy_tagged.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml index edcacd6f4..5f79292cc 100644 --- a/.github/workflows/deploy_snapshot.yml +++ b/.github/workflows/deploy_snapshot.yml @@ -10,5 +10,5 @@ on: jobs: build: - uses: dockstore/workflow-actions/.github/workflows/deploy_snapshot.yaml@seab-6771/reusable-image-deploy + uses: dockstore/workflow-actions/.github/workflows/deploy_artifacts.yaml@seab-6771/reusable-image-deploy secrets: inherit diff --git a/.github/workflows/deploy_tagged.yml b/.github/workflows/deploy_tagged.yml index f49991232..610fa23cc 100644 --- a/.github/workflows/deploy_tagged.yml +++ b/.github/workflows/deploy_tagged.yml @@ -7,5 +7,5 @@ on: jobs: call-reusable-tagged-release: - uses: dockstore/workflow-actions/.github/workflows/deploy_tagged.yaml@seab-6771/reusable-image-deploy + uses: dockstore/workflow-actions/.github/workflows/deploy_artifacts.yaml@seab-6771/reusable-image-deploy secrets: inherit From a88a7d8b10194c31d47ddf3d14dc0a36ebd623c2 Mon Sep 17 00:00:00 2001 From: Kathy Tran Date: Wed, 27 Nov 2024 10:30:38 -0500 Subject: [PATCH 7/7] Combine into one deploy artifacts workflow --- .../{deploy_snapshot.yml => deploy_artifacts.yml} | 4 +++- .github/workflows/deploy_tagged.yml | 11 ----------- 2 files changed, 3 insertions(+), 12 deletions(-) rename .github/workflows/{deploy_snapshot.yml => deploy_artifacts.yml} (84%) delete mode 100644 .github/workflows/deploy_tagged.yml diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_artifacts.yml similarity index 84% rename from .github/workflows/deploy_snapshot.yml rename to .github/workflows/deploy_artifacts.yml index 5f79292cc..0d209c6a4 100644 --- a/.github/workflows/deploy_snapshot.yml +++ b/.github/workflows/deploy_artifacts.yml @@ -1,7 +1,9 @@ -name: Deploy develop snapshot +name: Deploy artifacts on: push: + tags: + - '**' branches-ignore: - 'master' - 'release/**' diff --git a/.github/workflows/deploy_tagged.yml b/.github/workflows/deploy_tagged.yml deleted file mode 100644 index 610fa23cc..000000000 --- a/.github/workflows/deploy_tagged.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Tagged release deploy - -on: - push: - tags: - - '**' - -jobs: - call-reusable-tagged-release: - uses: dockstore/workflow-actions/.github/workflows/deploy_artifacts.yaml@seab-6771/reusable-image-deploy - secrets: inherit