Skip to content

Commit

Permalink
ci: update lint action
Browse files Browse the repository at this point in the history
  • Loading branch information
h-r-k-matsumoto committed Feb 4, 2024
1 parent 131a906 commit c2e3867
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 22 deletions.
3 changes: 2 additions & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ services:
depends_on:
- passenger-app
passenger-app:
image: ghcr.io/rakutentech/passenger-go-exporter/passenger-app:6.0.14
image: ghcr.io/rakutentech/passenger-go-exporter/passenger-app:6.0.20
platform: linux/x86_64
ports:
- 3000:3000
environment:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
- 6.0.20
steps:
- uses: actions/checkout@v4
- uses: engineerd/setup-kind@v0.5.0
- uses: helm/kind-action@v1.5.0
with:
version: "v0.21.0"
cluster_name: kind
- name: Kind Load Image
run: |
docker build -t passenger-go-exporter:test .
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
pull_request:
types: [opened, synchronize, reopened]

permissions:
contents: read

jobs:
test:
name: Test
Expand All @@ -13,9 +16,12 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: '1.20'
cache: false
- uses: actions/cache@v4
with:
path: ~/go/pkg/mod
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
Expand All @@ -28,7 +34,7 @@ jobs:
run: go test -json ./... > test.json
- name: annotate tests
if: always()
uses: guyarb/golang-test-annotations@v0.6.0
uses: guyarb/golang-test-annotations@v0.7.0
with:
test-results: test.json
lint:
Expand All @@ -38,11 +44,9 @@ jobs:
go-version: [1.20]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
stable: 'true'
go-version: '1.20'
cache: false
- uses: golangci/golangci-lint-action@v3
with:
skip-go-installation: true
18 changes: 9 additions & 9 deletions .github/workflows/releease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,29 @@ jobs:
COSIGN_EXPERIMENTAL: "1"
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install cosign
uses: sigstore/cosign-installer@v2
uses: sigstore/cosign-installer@v3

- name: Set env
run: echo "TAG_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.USERNAME }}
password: ${{ secrets.CR_PAT }}

- name: Build and push
id: build-and-push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down Expand Up @@ -77,18 +77,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: "1.20"

- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v4
uses: goreleaser/goreleaser-action@v5
with:
version: latest
args: release --rm-dist
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.CR_PAT }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ passenger-go-exporter

# Dependency directories (remove the comment below to include it)
# vendor/

dist/
File renamed without changes.
6 changes: 4 additions & 2 deletions .goreleaser.yml → .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
version: 1

before:
hooks:
# You may remove this if you don't use go modules.
- go mod download
- go mod tidy
# you may remove this if you don't need go generate
- go generate ./...
builds:
- env:
- CGO_ENABLED=0
goos:
- linux
- windows
- darwin
- linux
goarch:
- amd64
archives:
Expand Down
1 change: 1 addition & 0 deletions test/kubernetes/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ REPO_HOME=$(git rev-parse --show-toplevel)
kubectl delete namespace test --ignore-not-found=true --wait=true
kubectl create namespace test


# deploy
kubectl apply -k ${REPO_HOME}/test/kubernetes/test
kubectl set image -n test deployment/example example=ghcr.io/rakutentech/passenger-go-exporter/passenger-app:$PASSENGER_VERSION
Expand Down
2 changes: 1 addition & 1 deletion test/passenger-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ruby:3.3

ARG ARG_RAILS_VERSION=7.1.3
ARG ARG_RAILS_VERSION=7.0.8
ARG ARG_PASSENGER_VERSION=6.0.20
ENV RAILS_VERSION $ARG_RAILS_VERSION
ENV PASSENGER_VERSION $ARG_PASSENGER_VERSION
Expand Down

0 comments on commit c2e3867

Please sign in to comment.