Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/docker/dot-ci/releaser/alpine/a…
Browse files Browse the repository at this point in the history
…lpine-3.20.2
  • Loading branch information
sobolevn authored Jul 29, 2024
2 parents 7d226a8 + de3d5e8 commit d5930e8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .ci/docker-ci/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20.1
FROM alpine:3.20.2

LABEL maintainer="[email protected]"
LABEL vendor="git-secret team"
Expand Down
2 changes: 1 addition & 1 deletion .ci/release-ci/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20.1
FROM alpine:3.20.2

LABEL maintainer="[email protected]"
LABEL vendor="git-secret team"
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ concurrency:
group: ${{ github.head_ref || github.run_id }}-test
cancel-in-progress: true

permissions:
contents: read

jobs:
lint:
runs-on: ubuntu-latest
Expand All @@ -26,6 +29,7 @@ jobs:
docker-ci:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
docker-env:
- alma
Expand All @@ -44,6 +48,7 @@ jobs:
osx-ci:
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
test-verbose: [0, 1]
steps:
Expand Down

0 comments on commit d5930e8

Please sign in to comment.