metanorma/ci#45 update autorelease flow

metanorma · Nov 7, 2020 · d54e45a · d54e45a
1 parent 158d53e
commit d54e45a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 34 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -3,28 +3,12 @@
 # source: https://github.com/marketplace/actions/merge-pull-requests#usage
 name: automerge
 
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  status: {}
+on: status
 
 jobs:
   automerge:
     runs-on: ubuntu-latest
+    if: github.event.context == 'tests-passed-successfully'
     steps:
       - name: automerge
         uses: "pascalgn/automerge-action@v0.12.0"

diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
@@ -4,7 +4,7 @@ name: make
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, main  ]
     tags: [ v* ]
   pull_request:
 
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Install PlantUML Ubuntu
+      - name: install plantuml ubuntu
         if: matrix.os == 'ubuntu-latest'
         uses: nick-invision/retry@v1
         with:
@@ -31,21 +31,27 @@ jobs:
             sudo apt-get update -y && sudo bash -c
             "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
 
-      - name: Install PlantUML macOS
-        if: matrix.os == 'macos-latest'
+      - if: matrix.os == 'macos-latest'
         run: brew install plantuml
 
-      - name: Install PlantUML Windows
-        if: matrix.os == 'windows-latest'
-        run: |
-          cinst -y plantuml
+      - if: matrix.os == 'windows-latest'
+        run: cinst -y plantuml
 
-      - name: Make *nix
-        if: matrix.os != 'windows-latest'
-        run: |
-          make clean all 
+      - if: matrix.os != 'windows-latest'
+        run:  make clean all
 
-      - name: Make Windows
-        if: matrix.os == 'windows-latest'
-        run: |
-          make clean all SHELL=cmd
+      - if: matrix.os == 'windows-latest'
+        run: make clean all SHELL=cmd
+
+  tests-passed:
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger tests passed event
+        uses: Sibz/github-status-action@v1
+        with:
+          authToken: ${{ secrets.GITHUB_TOKEN }}
+          context: 'tests-passed-successfully'
+          description: 'Tests passed successfully'
+          state: 'success'
+          sha: ${{ github.event.pull_request.head.sha || github.sha }}