Skip to content

Commit

Permalink
chore(ci): regenerate layout
Browse files Browse the repository at this point in the history
  • Loading branch information
kilianpaquier committed Mar 8, 2024
1 parent 5376c98 commit 51a8d11
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 26 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
check-latest: true
go-version-file: go.mod
token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/go-dependency-submission@v2
with:
go-mod-path: go.mod
34 changes: 23 additions & 11 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,50 +10,62 @@ on:
- main
- staging
- develop
- v[0-9]+.x
- v[0-9]+.[0-9]+.x
- v[0-9]+
workflow_dispatch:

jobs:

go-vulncheck:
runs-on: ubuntu-latest
steps:
- uses: golang/govulncheck-action@v1
with:
check-latest: true
go-package: ./...
go-version-file: go.mod

go-lint:
runs-on: ubuntu-latest
permissions:
checks: write
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
cache: false
check-latest: true
go-version-file: go.mod
token: ${{ secrets.GITHUB_TOKEN }}
- uses: golangci/golangci-lint-action@v4
with:
args: --config .golangci.yml --timeout 240s --fast --sort-results --out-format colored-line-number
args: --config build/ci/.golangci.yml --timeout 240s --fast --sort-results --out-format colored-line-number

go-test:
strategy:
fail-fast: false
matrix:
os:
- on: macos-latest
include:
- os: macos-latest
args: CGO_ENABLED="0"
- on: ubuntu-latest
- os: ubuntu-latest
args: CGO_ENABLED="0"
- on: windows-latest
- os: windows-latest
args: env CGO_ENABLED="0"
runs-on: ${{ matrix.os.on }}
runs-on: ${{ matrix.os }}
env:
OS: ${{ matrix.os.on }}
OS: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
check-latest: true
go-version-file: go.mod
token: ${{ secrets.GITHUB_TOKEN }}
- run: ${{ matrix.os.args }} go test ./... -coverpkg="./..." -covermode="count" -coverprofile="coverage.out"
- run: ${{ matrix.args }} go test ./... -coverpkg="./..." -covermode="count" -coverprofile="coverage.out"
- uses: codecov/codecov-action@v4
if: ${{ ! startsWith(github.base_ref, 'dependabot') }} # ignore codecov on dependabot branches
with:
codecov_yml_path: codecov.yml
codecov_yml_path: build/ci/codecov.yml
disable_search: true
env_vars: OS
fail_ci_if_error: true
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
runs-on: ubuntu-latest
permissions:
contents: write
issues: write
pull-requests: write
outputs:
version: v${{ steps.semantic_release.outputs.new_release_version }}
release: ${{ steps.release.outputs.release }}
Expand All @@ -42,7 +44,7 @@ jobs:
branches: |
[
"(master|main)",
"v+([0-9])?(.{+([0-9]),x}).x",
"v+([0-9])",
{ "name": "next", "prerelease": true },
{ "name": "beta", "prerelease": true },
{ "name": "alpha", "prerelease": true },
Expand All @@ -65,6 +67,7 @@ jobs:
permissions:
contents: write
issues: write
pull-requests: write
env:
GIT_AUTHOR_NAME: ${{ github.triggering_actor }}
GIT_AUTHOR_EMAIL: ${{ github.triggering_actor }}@users.noreply.github.com
Expand All @@ -77,6 +80,7 @@ jobs:
- uses: actions/download-artifact@v4
with:
name: executables
path: dist
- id: semantic-release
uses: cycjimmy/semantic-release-action@v4
with:
Expand All @@ -94,7 +98,7 @@ jobs:
branches: |
[
"(master|main)",
"v+([0-9])?(.{+([0-9]),x}).x",
"v+([0-9])",
{ "name": "next", "prerelease": true },
{ "name": "beta", "prerelease": true },
{ "name": "alpha", "prerelease": true },
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dist
go.work

# reports
reports/
*.json
*.xml

Expand Down
5 changes: 3 additions & 2 deletions .releaserc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ plugins:
- assets:
- { path: CHANGELOG.md, label: CHANGELOG.md }
- { path: checksums.txt }
- { path: dist/* }
failComment: false,
- { path: dist }
failComment: true
failTitle: false
successComment: 🎉 This issue has been resolved in version v${nextRelease.version} 🎉
- "@semantic-release/exec"
11 changes: 1 addition & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
# This file is safe to edit. Once it exists it will not be overwritten.

include ./scripts/*.mk

.PHONY: generate
generate:
@craft generate $(ARGS)

.PHONY: clean
clean:
@go clean
@git clean -Xf ./*
include ./scripts/*.mk
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/build.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Code generated by craft; DO NOT EDIT.

CI_PROJECT_PATH := github.com/kilianpaquier/pooling
GCI_CONFIG_PATH := .golangci.yml
GCI_CONFIG_PATH := build/ci/.golangci.yml

.PHONY: lint
lint:
Expand Down
10 changes: 10 additions & 0 deletions scripts/craft.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Code generated by craft; DO NOT EDIT.

.PHONY: generate
generate:
@craft generate $(ARGS)

.PHONY: clean
clean:
@go clean
@git clean -Xf ./*

0 comments on commit 51a8d11

Please sign in to comment.