Merge pull request #60 from fraunhofer-iem/dev

Dev
fraunhofer-iem · Dec 2, 2021 · e3d87c2 · e3d87c2
2 parents b8cdedb + a62a39e
commit e3d87c2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -17,13 +17,13 @@ jobs:
   lint:
     uses: fraunhofer-iem/dodo-github-visualization/.github/workflows/lint.yml@main
 
-  build:
+  compile:
     uses: fraunhofer-iem/dodo-github-visualization/.github/workflows/compile.yml@main
     needs: lint
 
   tag:
     if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
-    needs: build
+    needs: compile
     uses: fraunhofer-iem/dodo-github-visualization/.github/workflows/tag.yml@main
     with:
       suffix: vortex

diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
@@ -9,6 +9,6 @@ jobs:
   lint:
     uses: fraunhofer-iem/dodo-github-visualization/.github/workflows/lint.yml@main
 
-  build:
+  compile:
     uses: fraunhofer-iem/dodo-github-visualization/.github/workflows/compile.yml@main
     needs: lint
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,13 +17,13 @@ jobs:
   lint:
     uses: fraunhofer-iem/dodo-github-visualization/.github/workflows/lint.yml@main
 
-  build:
+  compile:
     uses: fraunhofer-iem/dodo-github-visualization/.github/workflows/compile.yml@main
     needs: lint
 
   tag:
     if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch'}}
-    needs: build
+    needs: compile
     uses: fraunhofer-iem/dodo-github-visualization/.github/workflows/tag.yml@main
 
   release:

diff --git a/.github/workflows/updateDeploy.yml b/.github/workflows/updateDeploy.yml
@@ -8,6 +8,11 @@ on:
         type: string
 
   workflow_dispatch:
+    inputs:
+      tag:
+        description: Tag to be pushed to dodo-deployment
+        required: true
+        type: string
 
 jobs:
   updateDeployment:
@@ -20,21 +25,21 @@ jobs:
           token: ${{ secrets.ORG_ACCESS_TOKEN }}
           submodules: true
 
-      - name: Prepare submodule
-      - run: |
-          git submodule update --init --recursive -- dodo-github-visualization
-          cd dodo-github-visualization
-          git fetch --all --tags
-
       - name: Checkout desired tag (workflow_call)
         if: ${{ github.event_name != 'workflow_dispatch' }}
         run: |
+          git submodule update --init --recursive -- dodo-github-visualization
+          cd dodo-github-visualization
+          git fetch --all --tags
           git checkout ${{ inputs.tag }}
           cd ..
 
       - name: Checkout desired tag (workflow_dispatch)
         if: ${{ github.event_name == 'workflow_dispatch' }}
         run: |
+          git submodule update --init --recursive -- dodo-github-visualization
+          cd dodo-github-visualization
+          git fetch --all --tags
           git checkout ${{ github.event.inputs.tag }}
           cd ..
 
@@ -47,11 +52,11 @@ jobs:
       - name: Push changes (workflow_call)
         if: ${{ github.event_name != 'workflow_dispatch' }}
         run: |
-          git commit -m "dodo-github-visualization@${{ inputs.tag }}"
+          git commit -m "dodo-github-visualization@${{ inputs.tag }}" || echo "dodo-deployment/dodo-github-visualization already on ${{ inputs.tag }}"
           git push
 
       - name: Push changes (workflow_dispatch)
         if: ${{ github.event_name == 'workflow_dispatch' }}
         run: |
-          git commit -m "dodo-github-visualization@${{ github.event.inputs.tag }}"
+          git commit -m "dodo-github-visualization@${{ github.event.inputs.tag }}" || echo "dodo-deployment/dodo-github-visualization already on ${{ github.event.inputs.tag }}"
           git push