Skip to content

Commit

Permalink
Merge branch 'master' into ci/alpine-docker-tags
Browse files Browse the repository at this point in the history
  • Loading branch information
fmartingr committed Oct 12, 2024
2 parents 60f37b6 + a3772c3 commit 45f4fe7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/_golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: golangci-lint
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # 6.1.0
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # 6.1.1
with:
version: latest

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Set up gotestfmt
uses: gotesttools/gotestfmt-action@8b4478c7019be847373babde9300210e7de34bfb # v2.2.0

- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # 4.0.2
- uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # 4.1.0
with:
path: |
~/.cache/go-build
Expand All @@ -65,7 +65,7 @@ jobs:
- run: go build -tags osusergo,netgo -ldflags="-s -w -X main.version=$(git describe --tags) -X main.date=$(date --iso-8601=seconds)"

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # 4.5.0
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # 4.6.0
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Expand All @@ -83,7 +83,7 @@ jobs:
with:
go-version-file: ./go.mod

- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # 4.0.2
- uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # 4.1.0
with:
path: |
~/.cache/go-build
Expand Down
2 changes: 2 additions & 0 deletions docs/Usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ The above command will :

After you've run the container in background, you can access console of the container:

> In order to be able to access the container and execute commands you need to use the `alpine-` prefixed images.
```
docker exec -it shiori ash
```
Expand Down

0 comments on commit 45f4fe7

Please sign in to comment.