Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
h3mmy authored Feb 8, 2024
2 parents cf5d94d + 9b7e66c commit 2f798cc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/actions/lint/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runs:

# Run golangcilint before `go get` is ran
# https://github.com/golangci/golangci-lint-action/issues/23
- uses: golangci/golangci-lint-action@v3.7.0
- uses: golangci/golangci-lint-action@v3.7.1
with:
version: v1.55.1
args: --timeout 5m --config .github/lint/golangci.yaml
22 changes: 11 additions & 11 deletions .github/workflows/on-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ on:
- ready_for_review

jobs:
ent-ci:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
- name: Verify ent files
uses: ent/contrib/ci@master
# ent-ci:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
# - name: Setup Go
# uses: actions/setup-go@v5
# with:
# go-version-file: 'go.mod'
# - name: Verify ent files
# uses: ent/contrib/ci@master

lint:
runs-on: ubuntu-latest
Expand Down

0 comments on commit 2f798cc

Please sign in to comment.