Skip to content

Commit

Permalink
Ci builds to main (#168)
Browse files Browse the repository at this point in the history
* change the CI builds to trigger of main instead of master

* update cmake docker
  • Loading branch information
phlptp authored Sep 13, 2021
1 parent 052f57a commit dc1ff97
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/actions/cmake_config/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apt-get update \
libidn11=1.33-2.1ubuntu1.2 \
ca-certificates=20180409 \
make=4.1-9.1ubuntu1 \
git=1:2.17.1-1ubuntu0.8 \
git=1:2.17.1-1ubuntu0.9 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -17,6 +17,6 @@ LABEL name="units.cmake"
LABEL description="Units cmake tests"
LABEL vcs-ref=$GIT_COMMIT
LABEL vcs-url="https://github.com/LLNL/units"
LABEL version="0.4.2"
LABEL version="0.5.1"

ENTRYPOINT ["/entrypoint.sh"]
4 changes: 2 additions & 2 deletions .github/workflows/static-analyzers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Static Analyzers
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

jobs:
cpplint:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Tests
on:
push:
branches:
- master
- main
- v*
pull_request:
branches:
- master
- main

jobs:
pre-commit:
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
# copied from https://github.com/CLIUtils/CLI11

trigger:
- master
- main

pr:
- master
- main

variables:
units.header: OFF
Expand Down

0 comments on commit dc1ff97

Please sign in to comment.