Skip to content

Commit

Permalink
Align files (#253)
Browse files Browse the repository at this point in the history
Co-authored-by: github-actions <[email protected]>
  • Loading branch information
architectbot and actions-user authored Jul 12, 2022
1 parent f9fabd0 commit 8dcb9c7
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
architect: giantswarm/architect@4.23.0
architect: giantswarm/architect@4.24.0

workflows:
test:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre_commit_go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/setup-python@v3
- uses: actions/setup-go@v3
with:
go-version: "1.17.7"
Expand All @@ -23,4 +23,4 @@ jobs:
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \
sudo sh -s -- -b $GOPATH/bin ${GOLANGCI_LINT_VERSION}
- uses: pre-commit/action@v3.0.0
- uses: pre-commit/action@v2.0.3
13 changes: 9 additions & 4 deletions .github/workflows/zz_generated.create_release.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@5.7.0
# devctl@5.8.0
#
name: Create Release
on:
Expand Down Expand Up @@ -120,11 +120,13 @@ jobs:
echo "error: no changes in \"$file\"" >&2
exit 1
fi
- name: Set up git identity
run: |
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- name: Commit changes
run: |
file="${{ needs.gather_facts.outputs.project_go_path }}"
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git add $file
git commit -m "Bump version to ${{ steps.update_project_go.outputs.new_version }}"
- name: Push changes
Expand Down Expand Up @@ -167,10 +169,13 @@ jobs:
with:
version: ${{ needs.gather_facts.outputs.version }}
path: ./CHANGELOG.md
- name: Set up git identity
run: |
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- name: Create tag
run: |
version="${{ needs.gather_facts.outputs.version }}"
git config --local user.name "github-actions"
git tag "v$version" ${{ github.sha }}
- name: Push tag
env:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/zz_generated.create_release_pr.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@5.7.0
# devctl@5.8.0
#
name: Create Release PR
on:
Expand Down Expand Up @@ -188,12 +188,14 @@ jobs:
go install github.com/marwan-at-work/mod/cmd/[email protected]
mod upgrade
fi
- name: Set up git identity
run: |
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- name: Create release commit
env:
version: "${{ needs.gather_facts.outputs.version }}"
run: |
git config --local user.email "[email protected]"
git config --local user.name "github-actions"
git add -A
git commit -m "Release v${{ env.version }}"
- name: Push changes
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zz_generated.gitleaks.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@5.7.0
# devctl@5.8.0
#
name: gitleaks

Expand Down
2 changes: 1 addition & 1 deletion .github/zz_generated.windows-code-signing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# DO NOT EDIT. Generated with:
#
# devctl@5.7.0
# devctl@5.8.0
#

APPLICATION=$1
Expand Down
2 changes: 2 additions & 0 deletions .nancy-ignore.generated
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# This file is generated by https://github.com/giantswarm/github
# Repository specific ignores should be added to .nancy-ignore
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@5.7.0
# devctl@5.8.0
#

include Makefile.*.mk
Expand Down
7 changes: 6 additions & 1 deletion Makefile.gen.go.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@5.7.0
# devctl@5.8.0
#

PACKAGE_DIR := ./bin-dist
Expand Down Expand Up @@ -143,6 +143,11 @@ lint: ## Runs golangci-lint.
@echo "====> $@"
golangci-lint run -E gosec -E goconst --timeout=15m ./...

.PHONY: nancy
nancy: ## Runs nancy (requires v1.0.37 or newer).
@echo "====> $@"
CGO_ENABLED=0 go list -json -m all | nancy sleuth --skip-update-check --quiet --exclude-vulnerability-file ./.nancy-ignore --additional-exclude-vulnerability-files ./.nancy-ignore.generated

.PHONY: test
test: ## Runs go test with default values.
@echo "====> $@"
Expand Down

0 comments on commit 8dcb9c7

Please sign in to comment.