Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align files #1187

Merged
merged 2 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1
orbs:
architect: giantswarm/architect@4.31.0
architect: giantswarm/architect@4.33.0

workflows:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zz_generated.check_values_schema.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.13.0
# devctl@6.14.0
#
name: 'Values and schema'
on:
Expand Down
2 changes: 1 addition & 1 deletion .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@6.13.0
# devctl@6.14.0
#
name: Create Release
on:
Expand Down
2 changes: 1 addition & 1 deletion .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@6.13.0
# devctl@6.14.0
#
name: Create Release PR
on:
Expand Down
4 changes: 2 additions & 2 deletions .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@6.13.0
# devctl@6.14.0
#
name: gitleaks

Expand All @@ -14,4 +14,4 @@ jobs:
with:
fetch-depth: '0'
- name: gitleaks-action
uses: zricethezav/gitleaks-action@v1.6.0
uses: giantswarm/gitleaks-action@main
31 changes: 17 additions & 14 deletions .nancy-ignore
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
# pkg:golang/github.com/gin-gonic/[email protected]
CVE-2023-29401 until=2023-11-30
CVE-2023-29401 until=2024-01-31

# pkg:golang/github.com/hashicorp/consul/[email protected]
CVE-2022-29153 until=2023-11-30
CVE-2022-29153 until=2024-01-31

# pkg:golang/github.com/hashicorp/consul/[email protected]
CVE-2022-29153 until=2023-11-30
CVE-2021-41803 until=2023-11-30
CVE-2022-24687 until=2023-11-30
CVE-2022-29153 until=2024-01-31
CVE-2021-41803 until=2024-01-31
CVE-2022-24687 until=2024-01-31

# pkg:golang/github.com/kataras/iris/[email protected]
CVE-2021-23772 until=2023-11-30
CVE-2021-23772 until=2024-01-31

# pkg:golang/github.com/nats-io/[email protected]
CVE-2020-26892 until=2023-11-30
CVE-2021-3127 until=2023-11-30
CVE-2020-26892 until=2024-01-31
CVE-2021-3127 until=2024-01-31

# pkg:golang/golang.org/x/[email protected]
CVE-2023-39325 until=2024-01-31

# pkg:golang/github.com/opencontainers/[email protected]
CVE-2023-28642 until=2023-11-30
CVE-2023-27561 until=2023-11-30
CVE-2023-25809 until=2023-11-30
CVE-2023-28642 until=2024-01-31
CVE-2023-27561 until=2024-01-31
CVE-2023-25809 until=2024-01-31

# pkg:golang/golang.org/x/[email protected]
CVE-2023-3978 until=2023-11-30
CVE-2023-3978 until=2024-01-31

# pkg:golang/helm.sh/helm/[email protected]
CVE-2023-25165 until=2023-11-30
CVE-2023-25165 until=2024-01-31

# pkg:golang/k8s.io/[email protected]
CVE-2020-8561 until=2023-11-30
CVE-2020-8561 until=2024-01-31
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repos:
args: [ --format=json ]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-added-large-files
# check for unresolved merge conflicts
Expand Down
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@6.13.0
# devctl@6.14.0
#

include Makefile.*.mk
Expand Down
2 changes: 1 addition & 1 deletion Makefile.gen.app.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated with:
#
# devctl@6.13.0
# devctl@6.14.0
#

##@ App
Expand Down
2 changes: 1 addition & 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@6.13.0
# devctl@6.14.0
#

APPLICATION := $(shell go list -m | cut -d '/' -f 3)
Expand Down
File renamed without changes.