Merge branch 'develop' into dependabot/github_actions/mhausenblas/mkd…

…ocs-deploy-gh-pages-1.24
nolte · Dec 25, 2021 · efd4bb3 · efd4bb3
2 parents d9dbfa1 + a8b2d7f
commit efd4bb3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build-static-tests.yaml b/.github/workflows/build-static-tests.yaml
@@ -12,4 +12,4 @@ jobs:
 
       - uses: actions/setup-python@v2
 
-      - uses: pre-commit/action@v2.0.0
+      - uses: pre-commit/action@v2.0.3
diff --git a/.github/workflows/release-cd-refresh-master.yml b/.github/workflows/release-cd-refresh-master.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Checkout master
         uses: actions/checkout@v2.4.0
       - name: Merge Tag -> Master
-        uses: devmasx/merge-branch@v1.3.1
+        uses: devmasx/merge-branch@1.4.0
         with:
           type: now
           from_branch: ${{ github.event.ref }}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@ jobs:

		- uses: actions/setup-python@v2

		- uses: pre-commit/action@v2.0.0
		- uses: pre-commit/action@v2.0.3