Skip to content

Commit

Permalink
Merge 659cdf2 into 9669895
Browse files Browse the repository at this point in the history
  • Loading branch information
dlidstrom committed Jul 4, 2022
2 parents 9669895 + 659cdf2 commit fca2e48
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: C/C++ CI

on: [push, pull_request]
on:
push:
branches: [master]

pull_request:
branches: [master]

jobs:
bump-tag-dry:
Expand All @@ -9,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- name: Get next version
id: tag
uses: anothrNick/github-tag-action@1.17.2
uses: anothrNick/github-tag-action@1.36.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WITH_V: true
Expand Down Expand Up @@ -96,7 +101,7 @@ jobs:
build_args: DUPLO_VERSION=${{ env.DUPLO_VERSION }}
tags: ${{ env.DUPLO_VERSION }}
upload-release:
if: success() && github.ref == 'refs/heads/master'
if: success()
runs-on: ubuntu-latest
needs: [build-linux, build-macos]
steps:
Expand All @@ -105,7 +110,7 @@ jobs:
fetch-depth: '0'
- name: Bump version and push tag
id: tag
uses: anothrNick/github-tag-action@1.17.2
uses: anothrNick/github-tag-action@1.36.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WITH_V: true
Expand Down

0 comments on commit fca2e48

Please sign in to comment.