From 49c73d490beacc12e57274315e8385f1108a6128 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2025 22:05:12 +0000 Subject: [PATCH 01/11] chore: bump entgo.io/contrib from 0.5.0 to 0.6.0 in /api Bumps [entgo.io/contrib](https://github.com/ent/contrib) from 0.5.0 to 0.6.0. - [Release notes](https://github.com/ent/contrib/releases) - [Commits](https://github.com/ent/contrib/compare/v0.5.0...v0.6.0) --- updated-dependencies: - dependency-name: entgo.io/contrib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- api/go.mod | 7 +++---- api/go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/api/go.mod b/api/go.mod index 05f847ec8..53f1ad44f 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,12 +1,11 @@ module github.com/chanzuckerberg/happy/api go 1.22.0 - toolchain go1.22.10 require ( - entgo.io/contrib v0.5.0 - entgo.io/ent v0.13.1 + entgo.io/contrib v0.6.0 + entgo.io/ent v0.13.2-0.20240717044502-34158f2c129b github.com/aws/aws-sdk-go-v2 v1.34.0 github.com/aws/aws-sdk-go-v2/config v1.18.44 github.com/blang/semver v3.5.1+incompatible @@ -49,7 +48,7 @@ require ( ) require ( - ariga.io/atlas v0.19.1-0.20240203083654-5948b60a8e43 // indirect + ariga.io/atlas v0.25.1-0.20240717145915-af51d3945208 // indirect cirello.io/dynamolock/v2 v2.1.0 // indirect dario.cat/mergo v1.0.0 // indirect github.com/AlecAivazis/survey/v2 v2.3.7 // indirect diff --git a/api/go.sum b/api/go.sum index 516325241..e47b64d2d 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,13 +1,13 @@ -ariga.io/atlas v0.19.1-0.20240203083654-5948b60a8e43 h1:GwdJbXydHCYPedeeLt4x/lrlIISQ4JTH1mRWuE5ZZ14= -ariga.io/atlas v0.19.1-0.20240203083654-5948b60a8e43/go.mod h1:uj3pm+hUTVN/X5yfdBexHlZv+1Xu5u5ZbZx7+CDavNU= +ariga.io/atlas v0.25.1-0.20240717145915-af51d3945208 h1:ixs1c/fAXGS3mTdalyKQrtvfkFjgChih/unX66YTzYk= +ariga.io/atlas v0.25.1-0.20240717145915-af51d3945208/go.mod h1:KPLc7Zj+nzoXfWshrcY1RwlOh94dsATQEy4UPrF2RkM= cirello.io/dynamolock/v2 v2.1.0 h1:e6LzkovE5gNZwswiApUj/LPkLRguXvxgpRi/IO9dl5o= cirello.io/dynamolock/v2 v2.1.0/go.mod h1:HG0kb97+cRxO9Ce+3brresQgLGSGKPbnNLnJJr4ieYo= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -entgo.io/contrib v0.5.0 h1:M4IqodImfUm327RDwNAITLNz3PsxVeC3rD4DPeVA8Gs= -entgo.io/contrib v0.5.0/go.mod h1:q8dXQCmzqpSlVdT2bWDydjgznGcy3y4zmsYmVFC9V/U= -entgo.io/ent v0.13.1 h1:uD8QwN1h6SNphdCCzmkMN3feSUzNnVvV/WIkHKMbzOE= -entgo.io/ent v0.13.1/go.mod h1:qCEmo+biw3ccBn9OyL4ZK5dfpwg++l1Gxwac5B1206A= +entgo.io/contrib v0.6.0 h1:xfo4TbJE7sJZWx7BV7YrpSz7IPFvS8MzL3fnfzZjKvQ= +entgo.io/contrib v0.6.0/go.mod h1:3qWIseJ/9Wx2Hu5zVh15FDzv7d/UvKNcYKdViywWCQg= +entgo.io/ent v0.13.2-0.20240717044502-34158f2c129b h1:kC+uzL8UFWwtXQ+yY0wUdvVUgPlJPGU3Fx1uttM8PJA= +entgo.io/ent v0.13.2-0.20240717044502-34158f2c129b/go.mod h1:qCEmo+biw3ccBn9OyL4ZK5dfpwg++l1Gxwac5B1206A= github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ= github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= From d442307534774d60b16071749373696891a6b73c Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Tue, 28 Jan 2025 17:17:30 -0500 Subject: [PATCH 02/11] Update go.mod --- api/go.mod | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/go.mod b/api/go.mod index 53f1ad44f..8b2176564 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,7 +1,8 @@ module github.com/chanzuckerberg/happy/api -go 1.22.0 -toolchain go1.22.10 +go 1.22.5 + +toolchain go1.23.5 require ( entgo.io/contrib v0.6.0 From 2b708b4b0437d63733c50365a5c513239f10a3bb Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Tue, 28 Jan 2025 17:19:45 -0500 Subject: [PATCH 03/11] bump --- api/go.mod | 2 +- cli/go.mod | 4 +--- hvm/go.mod | 4 +--- shared/go.mod | 4 +--- terraform/provider/go.mod | 4 +--- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/api/go.mod b/api/go.mod index 8b2176564..649cbcf4b 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/chanzuckerberg/happy/api -go 1.22.5 +go 1.23.0 toolchain go1.23.5 diff --git a/cli/go.mod b/cli/go.mod index 9e33c7172..f0c74f6ea 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -1,6 +1,4 @@ -go 1.22.0 - -toolchain go1.22.7 +go 1.23.0 module github.com/chanzuckerberg/happy/cli diff --git a/hvm/go.mod b/hvm/go.mod index 7a34c607f..e224b55bc 100644 --- a/hvm/go.mod +++ b/hvm/go.mod @@ -1,8 +1,6 @@ module github.com/chanzuckerberg/happy/hvm -go 1.22 - -toolchain go1.22.2 +go 1.23.0 require ( github.com/chanzuckerberg/go-misc v1.10.3 diff --git a/shared/go.mod b/shared/go.mod index fe14740a4..13499c69e 100644 --- a/shared/go.mod +++ b/shared/go.mod @@ -1,8 +1,6 @@ module github.com/chanzuckerberg/happy/shared -go 1.22 - -toolchain go1.22.2 +go 1.23.0 require ( cirello.io/dynamolock/v2 v2.1.0 diff --git a/terraform/provider/go.mod b/terraform/provider/go.mod index 484c79f2d..bafab59ae 100644 --- a/terraform/provider/go.mod +++ b/terraform/provider/go.mod @@ -1,8 +1,6 @@ module github.com/chanzuckerberg/happy/terraform/provider -go 1.22 - -toolchain go1.22.2 +go 1.23.0 require ( github.com/aws/aws-sdk-go-v2 v1.34.0 From 1aa4f36bc367585581936ff97928b76a441accc3 Mon Sep 17 00:00:00 2001 From: alexlokshin-czi Date: Tue, 28 Jan 2025 22:54:19 +0000 Subject: [PATCH 04/11] ci - update ent schema --- api/pkg/ent/appconfig_query.go | 21 +++++++++++---------- api/pkg/ent/runtime/runtime.go | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/api/pkg/ent/appconfig_query.go b/api/pkg/ent/appconfig_query.go index 9dd97e984..8a917ece6 100644 --- a/api/pkg/ent/appconfig_query.go +++ b/api/pkg/ent/appconfig_query.go @@ -7,6 +7,7 @@ import ( "fmt" "math" + "entgo.io/ent" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" @@ -60,7 +61,7 @@ func (acq *AppConfigQuery) Order(o ...appconfig.OrderOption) *AppConfigQuery { // First returns the first AppConfig entity from the query. // Returns a *NotFoundError when no AppConfig was found. func (acq *AppConfigQuery) First(ctx context.Context) (*AppConfig, error) { - nodes, err := acq.Limit(1).All(setContextOp(ctx, acq.ctx, "First")) + nodes, err := acq.Limit(1).All(setContextOp(ctx, acq.ctx, ent.OpQueryFirst)) if err != nil { return nil, err } @@ -83,7 +84,7 @@ func (acq *AppConfigQuery) FirstX(ctx context.Context) *AppConfig { // Returns a *NotFoundError when no AppConfig ID was found. func (acq *AppConfigQuery) FirstID(ctx context.Context) (id uint, err error) { var ids []uint - if ids, err = acq.Limit(1).IDs(setContextOp(ctx, acq.ctx, "FirstID")); err != nil { + if ids, err = acq.Limit(1).IDs(setContextOp(ctx, acq.ctx, ent.OpQueryFirstID)); err != nil { return } if len(ids) == 0 { @@ -106,7 +107,7 @@ func (acq *AppConfigQuery) FirstIDX(ctx context.Context) uint { // Returns a *NotSingularError when more than one AppConfig entity is found. // Returns a *NotFoundError when no AppConfig entities are found. func (acq *AppConfigQuery) Only(ctx context.Context) (*AppConfig, error) { - nodes, err := acq.Limit(2).All(setContextOp(ctx, acq.ctx, "Only")) + nodes, err := acq.Limit(2).All(setContextOp(ctx, acq.ctx, ent.OpQueryOnly)) if err != nil { return nil, err } @@ -134,7 +135,7 @@ func (acq *AppConfigQuery) OnlyX(ctx context.Context) *AppConfig { // Returns a *NotFoundError when no entities are found. func (acq *AppConfigQuery) OnlyID(ctx context.Context) (id uint, err error) { var ids []uint - if ids, err = acq.Limit(2).IDs(setContextOp(ctx, acq.ctx, "OnlyID")); err != nil { + if ids, err = acq.Limit(2).IDs(setContextOp(ctx, acq.ctx, ent.OpQueryOnlyID)); err != nil { return } switch len(ids) { @@ -159,7 +160,7 @@ func (acq *AppConfigQuery) OnlyIDX(ctx context.Context) uint { // All executes the query and returns a list of AppConfigs. func (acq *AppConfigQuery) All(ctx context.Context) ([]*AppConfig, error) { - ctx = setContextOp(ctx, acq.ctx, "All") + ctx = setContextOp(ctx, acq.ctx, ent.OpQueryAll) if err := acq.prepareQuery(ctx); err != nil { return nil, err } @@ -181,7 +182,7 @@ func (acq *AppConfigQuery) IDs(ctx context.Context) (ids []uint, err error) { if acq.ctx.Unique == nil && acq.path != nil { acq.Unique(true) } - ctx = setContextOp(ctx, acq.ctx, "IDs") + ctx = setContextOp(ctx, acq.ctx, ent.OpQueryIDs) if err = acq.Select(appconfig.FieldID).Scan(ctx, &ids); err != nil { return nil, err } @@ -199,7 +200,7 @@ func (acq *AppConfigQuery) IDsX(ctx context.Context) []uint { // Count returns the count of the given query. func (acq *AppConfigQuery) Count(ctx context.Context) (int, error) { - ctx = setContextOp(ctx, acq.ctx, "Count") + ctx = setContextOp(ctx, acq.ctx, ent.OpQueryCount) if err := acq.prepareQuery(ctx); err != nil { return 0, err } @@ -217,7 +218,7 @@ func (acq *AppConfigQuery) CountX(ctx context.Context) int { // Exist returns true if the query has elements in the graph. func (acq *AppConfigQuery) Exist(ctx context.Context) (bool, error) { - ctx = setContextOp(ctx, acq.ctx, "Exist") + ctx = setContextOp(ctx, acq.ctx, ent.OpQueryExist) switch _, err := acq.FirstID(ctx); { case IsNotFound(err): return false, nil @@ -449,7 +450,7 @@ func (acgb *AppConfigGroupBy) Aggregate(fns ...AggregateFunc) *AppConfigGroupBy // Scan applies the selector query and scans the result into the given value. func (acgb *AppConfigGroupBy) Scan(ctx context.Context, v any) error { - ctx = setContextOp(ctx, acgb.build.ctx, "GroupBy") + ctx = setContextOp(ctx, acgb.build.ctx, ent.OpQueryGroupBy) if err := acgb.build.prepareQuery(ctx); err != nil { return err } @@ -497,7 +498,7 @@ func (acs *AppConfigSelect) Aggregate(fns ...AggregateFunc) *AppConfigSelect { // Scan applies the selector query and scans the result into the given value. func (acs *AppConfigSelect) Scan(ctx context.Context, v any) error { - ctx = setContextOp(ctx, acs.ctx, "Select") + ctx = setContextOp(ctx, acs.ctx, ent.OpQuerySelect) if err := acs.prepareQuery(ctx); err != nil { return err } diff --git a/api/pkg/ent/runtime/runtime.go b/api/pkg/ent/runtime/runtime.go index 0ce118f64..604562777 100644 --- a/api/pkg/ent/runtime/runtime.go +++ b/api/pkg/ent/runtime/runtime.go @@ -34,6 +34,6 @@ func init() { } const ( - Version = "v0.13.1" // Version of ent codegen. - Sum = "h1:uD8QwN1h6SNphdCCzmkMN3feSUzNnVvV/WIkHKMbzOE=" // Sum of ent codegen. + Version = "v0.13.2-0.20240717044502-34158f2c129b" // Version of ent codegen. + Sum = "h1:kC+uzL8UFWwtXQ+yY0wUdvVUgPlJPGU3Fx1uttM8PJA=" // Sum of ent codegen. ) From fa5dc08d51d1615b7bf01c34587d3738337db5fc Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Tue, 28 Jan 2025 18:17:12 -0500 Subject: [PATCH 05/11] Update Dockerfile.api --- Dockerfile.api | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.api b/Dockerfile.api index e885b60a5..43387bf23 100644 --- a/Dockerfile.api +++ b/Dockerfile.api @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine AS builder +FROM golang:1.23-alpine AS builder RUN apk update && apk add --no-cache git gcc RUN apk add --no-cache sqlite-libs sqlite-dev @@ -20,7 +20,7 @@ RUN --mount=type=cache,mode=0755,target=/go/pkg/mod GO111MODULE=on CGO_ENABLED=0 # -------------------------------------------------------------------------------------------------- -FROM golang:1.22-alpine +FROM golang:1.23-alpine COPY --from=builder /code/api/dist/happy-api . COPY --from=builder /code/api/app-config*.yaml . From 33f7ffb090005821f2f0d7a18b71ae39a7658581 Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Wed, 29 Jan 2025 10:19:33 -0500 Subject: [PATCH 06/11] Update api-ci.yml --- .github/workflows/api-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/api-ci.yml b/.github/workflows/api-ci.yml index 4ae79da35..018a8a603 100644 --- a/.github/workflows/api-ci.yml +++ b/.github/workflows/api-ci.yml @@ -65,7 +65,7 @@ jobs: with: version: v1.56.2 github-token: ${{ secrets.GITHUB_TOKEN }} - args: --timeout 10m0s --out-format=tab + args: --timeout 20m0s --out-format=tab skip-pkg-cache: true working-directory: api test-api: From 37513a4118f67b4724a8681acd2d85ff66b302b6 Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Wed, 29 Jan 2025 10:33:14 -0500 Subject: [PATCH 07/11] bump --- docs/Gemfile | 14 ++- docs/Gemfile.lock | 289 +++++++++++++++++++++++----------------------- 2 files changed, 157 insertions(+), 146 deletions(-) diff --git a/docs/Gemfile b/docs/Gemfile index 505cf3834..1dcb897f8 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -7,13 +7,12 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -# NOTE(elopez): commenting version out per https://docs.github.com/en/pages/setting-up-a-github-pages-site-with-jekyll/creating-a-github-pages-site-with-jekyll -# gem "jekyll", "~> 4.2.0" +# gem "jekyll", "~> 4.3.3" # This is the default theme for new Jekyll sites. You may change this to anything you like. gem "minima", "~> 2.5" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. -gem "github-pages", "~> 214", group: :jekyll_plugins +gem "github-pages", "~> 231", group: :jekyll_plugins # If you have any plugins, put them here! group :jekyll_plugins do gem "jekyll-feed", "~> 0.12" @@ -22,10 +21,17 @@ end # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # and associated library. platforms :mingw, :x64_mingw, :mswin, :jruby do - gem "tzinfo", "~> 1.2" + gem "tzinfo", ">= 1", "< 3" gem "tzinfo-data" end # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] +# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem +# do not have a Java counterpart. +gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] + +gem "webrick", "~> 1.8" + +gem "just-the-docs", "~> 0.8.2" \ No newline at end of file diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 366db6247..a0f2557ed 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -1,49 +1,51 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.6) + activesupport (6.1.7.10) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.11.1) + coffee-script-source (1.12.2) colorator (1.1.0) - commonmarker (0.17.13) - ruby-enum (~> 0.5) - concurrent-ruby (1.1.8) - dnsruby (1.61.5) - simpleidn (~> 0.1) - em-websocket (0.5.2) + commonmarker (0.23.11) + concurrent-ruby (1.3.5) + dnsruby (1.72.3) + base64 (~> 0.2.0) + simpleidn (~> 0.2.1) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) + http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (1.3.0) - faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - faraday-net_http (1.0.1) - ffi (1.15.0) + execjs (2.10.0) + faraday (2.8.1) + base64 + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + ffi (1.17.1) forwardable-extended (2.6.0) - gemoji (3.0.1) - github-pages (214) - github-pages-health-check (= 1.17.0) - jekyll (= 3.9.0) - jekyll-avatar (= 0.7.0) - jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.6) - jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.15.1) + gemoji (4.1.0) + github-pages (231) + github-pages-health-check (= 1.18.2) + jekyll (= 3.9.5) + jekyll-avatar (= 0.8.0) + jekyll-coffeescript (= 1.2.2) + jekyll-commonmark-ghpages (= 0.4.0) + jekyll-default-layout (= 0.1.5) + jekyll-feed (= 0.17.0) jekyll-gist (= 1.5.0) - jekyll-github-metadata (= 2.13.0) + jekyll-github-metadata (= 2.16.1) + jekyll-include-cache (= 0.2.1) jekyll-mentions (= 1.6.0) jekyll-optional-front-matter (= 0.3.2) jekyll-paginate (= 1.1.0) @@ -52,49 +54,49 @@ GEM jekyll-relative-links (= 0.6.1) jekyll-remote-theme (= 0.4.3) jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.7.1) + jekyll-seo-tag (= 2.8.0) jekyll-sitemap (= 1.4.0) jekyll-swiss (= 1.0.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.2) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.4) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) + jekyll-theme-architect (= 0.2.0) + jekyll-theme-cayman (= 0.2.0) + jekyll-theme-dinky (= 0.2.0) + jekyll-theme-hacker (= 0.2.0) + jekyll-theme-leap-day (= 0.2.0) + jekyll-theme-merlot (= 0.2.0) + jekyll-theme-midnight (= 0.2.0) + jekyll-theme-minimal (= 0.2.0) + jekyll-theme-modernist (= 0.2.0) + jekyll-theme-primer (= 0.6.0) + jekyll-theme-slate (= 0.2.0) + jekyll-theme-tactile (= 0.2.0) + jekyll-theme-time-machine (= 0.2.0) jekyll-titles-from-headings (= 0.5.3) - jemoji (= 0.12.0) - kramdown (= 2.3.1) + jemoji (= 0.13.0) + kramdown (= 2.4.0) kramdown-parser-gfm (= 1.1.0) - liquid (= 4.0.3) + liquid (= 4.0.4) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.10.4, < 2.0) - rouge (= 3.26.0) + nokogiri (>= 1.13.6, < 2.0) + rouge (= 3.30.0) terminal-table (~> 1.4) - github-pages-health-check (1.17.0) + github-pages-health-check (1.18.2) addressable (~> 2.3) dnsruby (~> 1.60) - octokit (~> 4.0) - public_suffix (>= 2.0.2, < 5.0) + octokit (>= 4, < 8) + public_suffix (>= 3.0, < 6.0) typhoeus (~> 1.3) - html-pipeline (2.14.0) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - http_parser.rb (0.6.0) - i18n (0.9.5) + http_parser.rb (0.8.0) + i18n (1.14.7) concurrent-ruby (~> 1.0) - jekyll (3.9.0) + jekyll (3.9.5) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) + i18n (>= 0.7, < 2) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) kramdown (>= 1.17, < 3) @@ -103,27 +105,29 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.7.0) + jekyll-avatar (0.8.0) jekyll (>= 3.0, < 5.0) - jekyll-coffeescript (1.1.1) + jekyll-coffeescript (1.2.2) coffee-script (~> 2.2) - coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.3.1) - commonmarker (~> 0.14) - jekyll (>= 3.7, < 5.0) - jekyll-commonmark-ghpages (0.1.6) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1.2) - rouge (>= 2.0, < 4.0) - jekyll-default-layout (0.1.4) - jekyll (~> 3.0) - jekyll-feed (0.15.1) + coffee-script-source (~> 1.12) + jekyll-commonmark (1.4.0) + commonmarker (~> 0.22) + jekyll-commonmark-ghpages (0.4.0) + commonmarker (~> 0.23.7) + jekyll (~> 3.9.0) + jekyll-commonmark (~> 1.4.0) + rouge (>= 2.0, < 5.0) + jekyll-default-layout (0.1.5) + jekyll (>= 3.0, < 5.0) + jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-github-metadata (2.13.0) + jekyll-github-metadata (2.16.1) jekyll (>= 3.4, < 5.0) - octokit (~> 4.0, != 4.4.0) + octokit (>= 4, < 7, != 4.4.0) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) @@ -143,129 +147,130 @@ GEM rubyzip (>= 1.3.0, < 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.7.1) + jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-swiss (1.0.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) + jekyll-theme-architect (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) + jekyll-theme-cayman (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) + jekyll-theme-dinky (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.2) + jekyll-theme-hacker (0.2.0) jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) + jekyll-theme-leap-day (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) + jekyll-theme-merlot (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) + jekyll-theme-midnight (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) + jekyll-theme-minimal (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) + jekyll-theme-modernist (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.4) + jekyll-theme-primer (0.6.0) jekyll (> 3.5, < 5.0) jekyll-github-metadata (~> 2.9) jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.1.1) - jekyll (~> 3.5) + jekyll-theme-slate (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) + jekyll-theme-tactile (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) + jekyll-theme-time-machine (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) jekyll-titles-from-headings (0.5.3) jekyll (>= 3.3, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.12.0) - gemoji (~> 3.0) + jemoji (0.13.0) + gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.1) + just-the-docs (0.8.2) + jekyll (>= 3.8.5) + jekyll-include-cache + jekyll-seo-tag (>= 2.0) + rake (>= 12.3.1) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.5.1) + liquid (4.0.4) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) + mini_portile2 (2.8.8) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.14.4) - multipart-post (2.1.1) - nokogiri (1.16.5-x86_64-darwin) + minitest (5.25.4) + nokogiri (1.13.10) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) - racc (~> 1.4) - octokit (4.20.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - racc (1.7.3) - rb-fsevent (0.10.4) - rb-inotify (0.10.1) + public_suffix (5.1.1) + racc (1.8.1) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.9) - rouge (3.26.0) - ruby-enum (0.9.0) - i18n - ruby2_keywords (0.0.4) - rubyzip (2.3.0) + rexml (3.4.0) + rouge (3.30.0) + ruby2_keywords (0.0.5) + rubyzip (2.4.1) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - simpleidn (0.2.1) - unf (~> 0.1.4) + faraday (>= 0.17.3, < 3) + simpleidn (0.2.3) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) - tzinfo (1.2.11) - thread_safe (~> 0.1) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - zeitwerk (2.4.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (1.8.0) + webrick (1.9.1) + zeitwerk (2.6.18) PLATFORMS - x86_64-darwin-20 - x86_64-linux + ruby DEPENDENCIES - github-pages (~> 214) + github-pages (~> 231) + http_parser.rb (~> 0.6.0) jekyll-feed (~> 0.12) + just-the-docs (~> 0.8.2) minima (~> 2.5) - tzinfo (~> 1.2) + tzinfo (>= 1, < 3) tzinfo-data wdm (~> 0.1.1) + webrick (~> 1.8) BUNDLED WITH - 2.2.15 + 1.17.2 From 098790e684651b28304ab54004b1648a40b8bbee Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Wed, 29 Jan 2025 11:02:02 -0500 Subject: [PATCH 08/11] The self-hosted runner: chanzuckerberg-arm64-si-arc-prod-dr866-h7tzt lost communication with the server. Verify the machine is running and has a healthy network connection. Anything in your workflow that terminates the runner process, starves it for CPU/Memory, or blocks its network access can cause this error. --- .github/workflows/api-ci.yml | 8 ++++---- .github/workflows/api-release-npm.yml | 4 ++-- .github/workflows/api-release-prod.yaml | 4 ++-- .github/workflows/api-release-staging.yaml | 2 +- .github/workflows/api-update-docs.yml | 4 ++-- .github/workflows/api-update-ent-schema.yml | 4 ++-- .github/workflows/automerge-dep.yml | 2 +- .github/workflows/charts-release.yml | 4 ++-- .github/workflows/cleanup-playground.yml | 8 ++++---- .github/workflows/cli-ci.yml | 6 +++--- .github/workflows/cli-release.yaml | 4 ++-- .github/workflows/conventional-commits.yml | 2 +- .github/workflows/hvm-ci.yml | 6 +++--- .github/workflows/hvm-release.yaml | 4 ++-- .github/workflows/jira-pr.yaml | 2 +- .github/workflows/provider-ci.yml | 6 +++--- .github/workflows/provider-release.yaml | 4 ++-- .github/workflows/provider-update-docs.yml | 4 ++-- .github/workflows/release-please.yaml | 2 +- .github/workflows/shared-ci.yml | 8 ++++---- .github/workflows/tf-ci.yml | 4 ++-- 21 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/api-ci.yml b/.github/workflows/api-ci.yml index 018a8a603..1c215314c 100644 --- a/.github/workflows/api-ci.yml +++ b/.github/workflows/api-ci.yml @@ -8,7 +8,7 @@ concurrency: name: api-build jobs: api_changes: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: pull-requests: read outputs: @@ -27,7 +27,7 @@ jobs: build-api: needs: api_changes if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: id-token: write contents: read @@ -50,7 +50,7 @@ jobs: lint-api: needs: api_changes if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -71,7 +71,7 @@ jobs: test-api: needs: api_changes if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 diff --git a/.github/workflows/api-release-npm.yml b/.github/workflows/api-release-npm.yml index 08e42dfdd..6148773bd 100644 --- a/.github/workflows/api-release-npm.yml +++ b/.github/workflows/api-release-npm.yml @@ -5,7 +5,7 @@ on: name: api-release-npm jobs: check-api-released: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Check Release id: api_released @@ -17,7 +17,7 @@ jobs: api_released: ${{ steps.api_released.outputs.result }} publish-npm-package: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest if: ${{ needs.check-api-released.outputs.api_released == 'true' }} needs: - check-api-released diff --git a/.github/workflows/api-release-prod.yaml b/.github/workflows/api-release-prod.yaml index 2468771e3..18eda0a17 100644 --- a/.github/workflows/api-release-prod.yaml +++ b/.github/workflows/api-release-prod.yaml @@ -9,7 +9,7 @@ concurrency: name: api-release-prod jobs: check-api-released: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Check Release id: api_released @@ -21,7 +21,7 @@ jobs: api_released: ${{ steps.api_released.outputs.result }} release-api: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest if: ${{ needs.check-api-released.outputs.api_released == 'true' }} needs: - check-api-released diff --git a/.github/workflows/api-release-staging.yaml b/.github/workflows/api-release-staging.yaml index 2ed6983fb..75d3006f4 100644 --- a/.github/workflows/api-release-staging.yaml +++ b/.github/workflows/api-release-staging.yaml @@ -9,7 +9,7 @@ concurrency: name: api-release-staging jobs: release-api: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: id-token: write contents: read diff --git a/.github/workflows/api-update-docs.yml b/.github/workflows/api-update-docs.yml index f291019e3..e740c3683 100644 --- a/.github/workflows/api-update-docs.yml +++ b/.github/workflows/api-update-docs.yml @@ -7,7 +7,7 @@ concurrency: name: api-docs jobs: api_changes: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: pull-requests: read outputs: @@ -25,7 +25,7 @@ jobs: update-api-docs: needs: api_changes if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Generate token id: generate_token diff --git a/.github/workflows/api-update-ent-schema.yml b/.github/workflows/api-update-ent-schema.yml index c193b32e1..b153b5bfa 100644 --- a/.github/workflows/api-update-ent-schema.yml +++ b/.github/workflows/api-update-ent-schema.yml @@ -7,7 +7,7 @@ concurrency: name: api-ent-schema jobs: api_changes: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: pull-requests: read outputs: @@ -25,7 +25,7 @@ jobs: update-api-ent-schema: needs: api_changes if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Generate token id: generate_token diff --git a/.github/workflows/automerge-dep.yml b/.github/workflows/automerge-dep.yml index 1adff9476..70f128f6c 100644 --- a/.github/workflows/automerge-dep.yml +++ b/.github/workflows/automerge-dep.yml @@ -8,7 +8,7 @@ concurrency: cancel-in-progress: true jobs: dependabot: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Generate token diff --git a/.github/workflows/charts-release.yml b/.github/workflows/charts-release.yml index 3190d458e..a2061209a 100644 --- a/.github/workflows/charts-release.yml +++ b/.github/workflows/charts-release.yml @@ -10,7 +10,7 @@ concurrency: jobs: check-chart-released: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Check Release id: chart_released @@ -27,7 +27,7 @@ jobs: needs: - check-chart-released # NOTE: needs to be X64 because of helm-releaser - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Parse Version id: parse_version diff --git a/.github/workflows/cleanup-playground.yml b/.github/workflows/cleanup-playground.yml index 5aba8a3e4..ec699bdb1 100644 --- a/.github/workflows/cleanup-playground.yml +++ b/.github/workflows/cleanup-playground.yml @@ -11,7 +11,7 @@ on: jobs: find-examples: name: Find examples - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest outputs: examples: ${{ steps.findExamples.outputs.examples }} steps: @@ -35,7 +35,7 @@ jobs: run: working-directory: ./examples/${{matrix.example}} name: Clean rdev happy stacks - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: id-token: write contents: read @@ -66,7 +66,7 @@ jobs: run: working-directory: ./examples/${{matrix.example}} name: Clean staging happy stacks - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: id-token: write contents: read @@ -97,7 +97,7 @@ jobs: run: working-directory: ./examples/${{matrix.example}} name: Clean prod happy stacks - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: id-token: write contents: read diff --git a/.github/workflows/cli-ci.yml b/.github/workflows/cli-ci.yml index 413c2edb5..86d12f771 100644 --- a/.github/workflows/cli-ci.yml +++ b/.github/workflows/cli-ci.yml @@ -7,7 +7,7 @@ concurrency: name: cli-build jobs: cli_changes: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: pull-requests: read outputs: @@ -25,7 +25,7 @@ jobs: lint-cli: needs: cli_changes if: ${{ needs.cli_changes.outputs.run_cli_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -47,7 +47,7 @@ jobs: test-cli: needs: cli_changes if: ${{ needs.cli_changes.outputs.run_cli_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Generate token id: generate_token diff --git a/.github/workflows/cli-release.yaml b/.github/workflows/cli-release.yaml index e62877879..15bf94308 100644 --- a/.github/workflows/cli-release.yaml +++ b/.github/workflows/cli-release.yaml @@ -8,7 +8,7 @@ concurrency: name: release-cli jobs: check-cli-released: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Check Release id: cli_released @@ -20,7 +20,7 @@ jobs: cli_released: ${{ steps.cli_released.outputs.result }} go-release-cli: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest if: ${{ needs.check-cli-released.outputs.cli_released == 'true' }} needs: - check-cli-released diff --git a/.github/workflows/conventional-commits.yml b/.github/workflows/conventional-commits.yml index f7ff3df58..2b766f52b 100644 --- a/.github/workflows/conventional-commits.yml +++ b/.github/workflows/conventional-commits.yml @@ -14,6 +14,6 @@ concurrency: cancel-in-progress: true jobs: conventional_commit_title: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - uses: chanzuckerberg/github-actions/.github/actions/conventional-commits@v1.3.1 diff --git a/.github/workflows/hvm-ci.yml b/.github/workflows/hvm-ci.yml index b476ff278..3b1e21d2f 100644 --- a/.github/workflows/hvm-ci.yml +++ b/.github/workflows/hvm-ci.yml @@ -7,7 +7,7 @@ concurrency: name: hvm-build jobs: hvm_changes: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: pull-requests: read outputs: @@ -25,7 +25,7 @@ jobs: lint-cli: needs: hvm_changes if: ${{ needs.cli_changes.outputs.run_hvm_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -47,7 +47,7 @@ jobs: test-cli: needs: hvm_changes if: ${{ needs.hvm_changes.outputs.run_hvm_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Generate token id: generate_token diff --git a/.github/workflows/hvm-release.yaml b/.github/workflows/hvm-release.yaml index d30018d12..274ef231e 100644 --- a/.github/workflows/hvm-release.yaml +++ b/.github/workflows/hvm-release.yaml @@ -8,7 +8,7 @@ concurrency: name: release-hvm jobs: check-hvm-released: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Check Release id: hvm_released @@ -20,7 +20,7 @@ jobs: hvm_released: ${{ steps.hvm_released.outputs.result }} go-release-hvm: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest if: ${{ needs.check-hvm-released.outputs.hvm_released == 'true' }} needs: - check-hvm-released diff --git a/.github/workflows/jira-pr.yaml b/.github/workflows/jira-pr.yaml index 9c6cf308b..93ac2fd76 100644 --- a/.github/workflows/jira-pr.yaml +++ b/.github/workflows/jira-pr.yaml @@ -10,7 +10,7 @@ name: Jira PR jobs: validate_jira_reference: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Validate Jira Reference id: validateJiraReference diff --git a/.github/workflows/provider-ci.yml b/.github/workflows/provider-ci.yml index df8d45fc9..fe02fd9d4 100644 --- a/.github/workflows/provider-ci.yml +++ b/.github/workflows/provider-ci.yml @@ -8,7 +8,7 @@ concurrency: name: provider-build jobs: provider_changes: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: pull-requests: read outputs: @@ -26,7 +26,7 @@ jobs: lint-provider: needs: provider_changes if: ${{ needs.provider_changes.outputs.run_provider_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -45,7 +45,7 @@ jobs: test-provider: needs: provider_changes if: ${{ needs.provider_changes.outputs.run_provider_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 diff --git a/.github/workflows/provider-release.yaml b/.github/workflows/provider-release.yaml index 1dd7bf0e0..7b7593669 100644 --- a/.github/workflows/provider-release.yaml +++ b/.github/workflows/provider-release.yaml @@ -7,7 +7,7 @@ concurrency: name: release-provider jobs: check-provider-released: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Check Release id: provider_released @@ -19,7 +19,7 @@ jobs: provider_released: ${{ steps.provider_released.outputs.result }} go-release-provider: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest if: ${{ needs.check-provider-released.outputs.provider_released == 'true' }} needs: - check-provider-released diff --git a/.github/workflows/provider-update-docs.yml b/.github/workflows/provider-update-docs.yml index 7d09bca20..654605737 100644 --- a/.github/workflows/provider-update-docs.yml +++ b/.github/workflows/provider-update-docs.yml @@ -8,7 +8,7 @@ concurrency: name: provider-docs jobs: provider_changes: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: pull-requests: read outputs: @@ -26,7 +26,7 @@ jobs: update-provider-docs: needs: provider_changes if: ${{ needs.provider_changes.outputs.run_provider_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Generate token id: generate_token diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index 256dde988..531dd87c3 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -8,7 +8,7 @@ concurrency: name: release-please jobs: release-please: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: # See https://docs.github.com/en/actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow # For why we need to generate a token and not use the default diff --git a/.github/workflows/shared-ci.yml b/.github/workflows/shared-ci.yml index d012b01de..4e1573e83 100644 --- a/.github/workflows/shared-ci.yml +++ b/.github/workflows/shared-ci.yml @@ -8,7 +8,7 @@ concurrency: name: shared-build jobs: shared_changes: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: pull-requests: read outputs: @@ -26,7 +26,7 @@ jobs: lint-shared: needs: shared_changes if: ${{ needs.shared_changes.outputs.run_shared_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -48,7 +48,7 @@ jobs: test-shared: needs: shared_changes if: ${{ needs.shared_changes.outputs.run_shared_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -64,7 +64,7 @@ jobs: update-go-mod: needs: shared_changes if: ${{ needs.shared_changes.outputs.run_shared_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest steps: - name: Generate token id: generate_token diff --git a/.github/workflows/tf-ci.yml b/.github/workflows/tf-ci.yml index f0e78ec4a..2540c3b7c 100644 --- a/.github/workflows/tf-ci.yml +++ b/.github/workflows/tf-ci.yml @@ -7,7 +7,7 @@ concurrency: cancel-in-progress: true jobs: tf_module_changes: - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest permissions: pull-requests: read outputs: @@ -25,7 +25,7 @@ jobs: find-changed-dirs: needs: tf_module_changes if: ${{ needs.tf_module_changes.outputs.run_tf_modules_ci == 'true' }} - runs-on: [ARM64, self-hosted, Linux] + runs-on: ubuntu-latest outputs: allChanges: ${{ steps.changedDirs.outputs.allChanges }} steps: From c5c2b3962bec27a17a0a3479bd0b0b011ec1064a Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Wed, 29 Jan 2025 11:06:30 -0500 Subject: [PATCH 09/11] Revert "The self-hosted runner: chanzuckerberg-arm64-si-arc-prod-dr866-h7tzt lost communication with the server. Verify the machine is running and has a healthy network connection. Anything in your workflow that terminates the runner process, starves it for CPU/Memory, or blocks its network access can cause this error." This reverts commit 098790e684651b28304ab54004b1648a40b8bbee. --- .github/workflows/api-ci.yml | 8 ++++---- .github/workflows/api-release-npm.yml | 4 ++-- .github/workflows/api-release-prod.yaml | 4 ++-- .github/workflows/api-release-staging.yaml | 2 +- .github/workflows/api-update-docs.yml | 4 ++-- .github/workflows/api-update-ent-schema.yml | 4 ++-- .github/workflows/automerge-dep.yml | 2 +- .github/workflows/charts-release.yml | 4 ++-- .github/workflows/cleanup-playground.yml | 8 ++++---- .github/workflows/cli-ci.yml | 6 +++--- .github/workflows/cli-release.yaml | 4 ++-- .github/workflows/conventional-commits.yml | 2 +- .github/workflows/hvm-ci.yml | 6 +++--- .github/workflows/hvm-release.yaml | 4 ++-- .github/workflows/jira-pr.yaml | 2 +- .github/workflows/provider-ci.yml | 6 +++--- .github/workflows/provider-release.yaml | 4 ++-- .github/workflows/provider-update-docs.yml | 4 ++-- .github/workflows/release-please.yaml | 2 +- .github/workflows/shared-ci.yml | 8 ++++---- .github/workflows/tf-ci.yml | 4 ++-- 21 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/api-ci.yml b/.github/workflows/api-ci.yml index 1c215314c..018a8a603 100644 --- a/.github/workflows/api-ci.yml +++ b/.github/workflows/api-ci.yml @@ -8,7 +8,7 @@ concurrency: name: api-build jobs: api_changes: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: pull-requests: read outputs: @@ -27,7 +27,7 @@ jobs: build-api: needs: api_changes if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: id-token: write contents: read @@ -50,7 +50,7 @@ jobs: lint-api: needs: api_changes if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -71,7 +71,7 @@ jobs: test-api: needs: api_changes if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 diff --git a/.github/workflows/api-release-npm.yml b/.github/workflows/api-release-npm.yml index 6148773bd..08e42dfdd 100644 --- a/.github/workflows/api-release-npm.yml +++ b/.github/workflows/api-release-npm.yml @@ -5,7 +5,7 @@ on: name: api-release-npm jobs: check-api-released: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Check Release id: api_released @@ -17,7 +17,7 @@ jobs: api_released: ${{ steps.api_released.outputs.result }} publish-npm-package: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] if: ${{ needs.check-api-released.outputs.api_released == 'true' }} needs: - check-api-released diff --git a/.github/workflows/api-release-prod.yaml b/.github/workflows/api-release-prod.yaml index 18eda0a17..2468771e3 100644 --- a/.github/workflows/api-release-prod.yaml +++ b/.github/workflows/api-release-prod.yaml @@ -9,7 +9,7 @@ concurrency: name: api-release-prod jobs: check-api-released: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Check Release id: api_released @@ -21,7 +21,7 @@ jobs: api_released: ${{ steps.api_released.outputs.result }} release-api: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] if: ${{ needs.check-api-released.outputs.api_released == 'true' }} needs: - check-api-released diff --git a/.github/workflows/api-release-staging.yaml b/.github/workflows/api-release-staging.yaml index 75d3006f4..2ed6983fb 100644 --- a/.github/workflows/api-release-staging.yaml +++ b/.github/workflows/api-release-staging.yaml @@ -9,7 +9,7 @@ concurrency: name: api-release-staging jobs: release-api: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: id-token: write contents: read diff --git a/.github/workflows/api-update-docs.yml b/.github/workflows/api-update-docs.yml index e740c3683..f291019e3 100644 --- a/.github/workflows/api-update-docs.yml +++ b/.github/workflows/api-update-docs.yml @@ -7,7 +7,7 @@ concurrency: name: api-docs jobs: api_changes: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: pull-requests: read outputs: @@ -25,7 +25,7 @@ jobs: update-api-docs: needs: api_changes if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Generate token id: generate_token diff --git a/.github/workflows/api-update-ent-schema.yml b/.github/workflows/api-update-ent-schema.yml index b153b5bfa..c193b32e1 100644 --- a/.github/workflows/api-update-ent-schema.yml +++ b/.github/workflows/api-update-ent-schema.yml @@ -7,7 +7,7 @@ concurrency: name: api-ent-schema jobs: api_changes: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: pull-requests: read outputs: @@ -25,7 +25,7 @@ jobs: update-api-ent-schema: needs: api_changes if: ${{ needs.api_changes.outputs.run_api_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Generate token id: generate_token diff --git a/.github/workflows/automerge-dep.yml b/.github/workflows/automerge-dep.yml index 70f128f6c..1adff9476 100644 --- a/.github/workflows/automerge-dep.yml +++ b/.github/workflows/automerge-dep.yml @@ -8,7 +8,7 @@ concurrency: cancel-in-progress: true jobs: dependabot: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Generate token diff --git a/.github/workflows/charts-release.yml b/.github/workflows/charts-release.yml index a2061209a..3190d458e 100644 --- a/.github/workflows/charts-release.yml +++ b/.github/workflows/charts-release.yml @@ -10,7 +10,7 @@ concurrency: jobs: check-chart-released: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Check Release id: chart_released @@ -27,7 +27,7 @@ jobs: needs: - check-chart-released # NOTE: needs to be X64 because of helm-releaser - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Parse Version id: parse_version diff --git a/.github/workflows/cleanup-playground.yml b/.github/workflows/cleanup-playground.yml index ec699bdb1..5aba8a3e4 100644 --- a/.github/workflows/cleanup-playground.yml +++ b/.github/workflows/cleanup-playground.yml @@ -11,7 +11,7 @@ on: jobs: find-examples: name: Find examples - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] outputs: examples: ${{ steps.findExamples.outputs.examples }} steps: @@ -35,7 +35,7 @@ jobs: run: working-directory: ./examples/${{matrix.example}} name: Clean rdev happy stacks - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: id-token: write contents: read @@ -66,7 +66,7 @@ jobs: run: working-directory: ./examples/${{matrix.example}} name: Clean staging happy stacks - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: id-token: write contents: read @@ -97,7 +97,7 @@ jobs: run: working-directory: ./examples/${{matrix.example}} name: Clean prod happy stacks - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: id-token: write contents: read diff --git a/.github/workflows/cli-ci.yml b/.github/workflows/cli-ci.yml index 86d12f771..413c2edb5 100644 --- a/.github/workflows/cli-ci.yml +++ b/.github/workflows/cli-ci.yml @@ -7,7 +7,7 @@ concurrency: name: cli-build jobs: cli_changes: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: pull-requests: read outputs: @@ -25,7 +25,7 @@ jobs: lint-cli: needs: cli_changes if: ${{ needs.cli_changes.outputs.run_cli_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -47,7 +47,7 @@ jobs: test-cli: needs: cli_changes if: ${{ needs.cli_changes.outputs.run_cli_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Generate token id: generate_token diff --git a/.github/workflows/cli-release.yaml b/.github/workflows/cli-release.yaml index 15bf94308..e62877879 100644 --- a/.github/workflows/cli-release.yaml +++ b/.github/workflows/cli-release.yaml @@ -8,7 +8,7 @@ concurrency: name: release-cli jobs: check-cli-released: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Check Release id: cli_released @@ -20,7 +20,7 @@ jobs: cli_released: ${{ steps.cli_released.outputs.result }} go-release-cli: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] if: ${{ needs.check-cli-released.outputs.cli_released == 'true' }} needs: - check-cli-released diff --git a/.github/workflows/conventional-commits.yml b/.github/workflows/conventional-commits.yml index 2b766f52b..f7ff3df58 100644 --- a/.github/workflows/conventional-commits.yml +++ b/.github/workflows/conventional-commits.yml @@ -14,6 +14,6 @@ concurrency: cancel-in-progress: true jobs: conventional_commit_title: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - uses: chanzuckerberg/github-actions/.github/actions/conventional-commits@v1.3.1 diff --git a/.github/workflows/hvm-ci.yml b/.github/workflows/hvm-ci.yml index 3b1e21d2f..b476ff278 100644 --- a/.github/workflows/hvm-ci.yml +++ b/.github/workflows/hvm-ci.yml @@ -7,7 +7,7 @@ concurrency: name: hvm-build jobs: hvm_changes: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: pull-requests: read outputs: @@ -25,7 +25,7 @@ jobs: lint-cli: needs: hvm_changes if: ${{ needs.cli_changes.outputs.run_hvm_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -47,7 +47,7 @@ jobs: test-cli: needs: hvm_changes if: ${{ needs.hvm_changes.outputs.run_hvm_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Generate token id: generate_token diff --git a/.github/workflows/hvm-release.yaml b/.github/workflows/hvm-release.yaml index 274ef231e..d30018d12 100644 --- a/.github/workflows/hvm-release.yaml +++ b/.github/workflows/hvm-release.yaml @@ -8,7 +8,7 @@ concurrency: name: release-hvm jobs: check-hvm-released: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Check Release id: hvm_released @@ -20,7 +20,7 @@ jobs: hvm_released: ${{ steps.hvm_released.outputs.result }} go-release-hvm: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] if: ${{ needs.check-hvm-released.outputs.hvm_released == 'true' }} needs: - check-hvm-released diff --git a/.github/workflows/jira-pr.yaml b/.github/workflows/jira-pr.yaml index 93ac2fd76..9c6cf308b 100644 --- a/.github/workflows/jira-pr.yaml +++ b/.github/workflows/jira-pr.yaml @@ -10,7 +10,7 @@ name: Jira PR jobs: validate_jira_reference: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Validate Jira Reference id: validateJiraReference diff --git a/.github/workflows/provider-ci.yml b/.github/workflows/provider-ci.yml index fe02fd9d4..df8d45fc9 100644 --- a/.github/workflows/provider-ci.yml +++ b/.github/workflows/provider-ci.yml @@ -8,7 +8,7 @@ concurrency: name: provider-build jobs: provider_changes: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: pull-requests: read outputs: @@ -26,7 +26,7 @@ jobs: lint-provider: needs: provider_changes if: ${{ needs.provider_changes.outputs.run_provider_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -45,7 +45,7 @@ jobs: test-provider: needs: provider_changes if: ${{ needs.provider_changes.outputs.run_provider_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 diff --git a/.github/workflows/provider-release.yaml b/.github/workflows/provider-release.yaml index 7b7593669..1dd7bf0e0 100644 --- a/.github/workflows/provider-release.yaml +++ b/.github/workflows/provider-release.yaml @@ -7,7 +7,7 @@ concurrency: name: release-provider jobs: check-provider-released: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Check Release id: provider_released @@ -19,7 +19,7 @@ jobs: provider_released: ${{ steps.provider_released.outputs.result }} go-release-provider: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] if: ${{ needs.check-provider-released.outputs.provider_released == 'true' }} needs: - check-provider-released diff --git a/.github/workflows/provider-update-docs.yml b/.github/workflows/provider-update-docs.yml index 654605737..7d09bca20 100644 --- a/.github/workflows/provider-update-docs.yml +++ b/.github/workflows/provider-update-docs.yml @@ -8,7 +8,7 @@ concurrency: name: provider-docs jobs: provider_changes: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: pull-requests: read outputs: @@ -26,7 +26,7 @@ jobs: update-provider-docs: needs: provider_changes if: ${{ needs.provider_changes.outputs.run_provider_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Generate token id: generate_token diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index 531dd87c3..256dde988 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -8,7 +8,7 @@ concurrency: name: release-please jobs: release-please: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: # See https://docs.github.com/en/actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow # For why we need to generate a token and not use the default diff --git a/.github/workflows/shared-ci.yml b/.github/workflows/shared-ci.yml index 4e1573e83..d012b01de 100644 --- a/.github/workflows/shared-ci.yml +++ b/.github/workflows/shared-ci.yml @@ -8,7 +8,7 @@ concurrency: name: shared-build jobs: shared_changes: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: pull-requests: read outputs: @@ -26,7 +26,7 @@ jobs: lint-shared: needs: shared_changes if: ${{ needs.shared_changes.outputs.run_shared_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -48,7 +48,7 @@ jobs: test-shared: needs: shared_changes if: ${{ needs.shared_changes.outputs.run_shared_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -64,7 +64,7 @@ jobs: update-go-mod: needs: shared_changes if: ${{ needs.shared_changes.outputs.run_shared_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] steps: - name: Generate token id: generate_token diff --git a/.github/workflows/tf-ci.yml b/.github/workflows/tf-ci.yml index 2540c3b7c..f0e78ec4a 100644 --- a/.github/workflows/tf-ci.yml +++ b/.github/workflows/tf-ci.yml @@ -7,7 +7,7 @@ concurrency: cancel-in-progress: true jobs: tf_module_changes: - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] permissions: pull-requests: read outputs: @@ -25,7 +25,7 @@ jobs: find-changed-dirs: needs: tf_module_changes if: ${{ needs.tf_module_changes.outputs.run_tf_modules_ci == 'true' }} - runs-on: ubuntu-latest + runs-on: [ARM64, self-hosted, Linux] outputs: allChanges: ${{ steps.changedDirs.outputs.allChanges }} steps: From 105dd9f93bffec7ab310f706581d7b9ad9299ad8 Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Wed, 29 Jan 2025 12:26:49 -0500 Subject: [PATCH 10/11] bump --- .github/workflows/api-ci.yml | 4 ++-- .github/workflows/cli-ci.yml | 6 +++--- .github/workflows/hvm-ci.yml | 6 +++--- .github/workflows/provider-ci.yml | 6 +++--- .github/workflows/shared-ci.yml | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/api-ci.yml b/.github/workflows/api-ci.yml index 018a8a603..b818e33e0 100644 --- a/.github/workflows/api-ci.yml +++ b/.github/workflows/api-ci.yml @@ -61,9 +61,9 @@ jobs: working-directory: api run: go mod tidy - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: v1.56.2 + version: v1.63.4 github-token: ${{ secrets.GITHUB_TOKEN }} args: --timeout 20m0s --out-format=tab skip-pkg-cache: true diff --git a/.github/workflows/cli-ci.yml b/.github/workflows/cli-ci.yml index 413c2edb5..10ae9df71 100644 --- a/.github/workflows/cli-ci.yml +++ b/.github/workflows/cli-ci.yml @@ -36,11 +36,11 @@ jobs: run: | cd cli && go mod tidy - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: v1.56.2 + version: v1.63.4 github-token: ${{ secrets.GITHUB_TOKEN }} - args: --timeout 10m0s --out-format=tab + args: --timeout 20m0s --out-format=tab working-directory: cli skip-pkg-cache: true diff --git a/.github/workflows/hvm-ci.yml b/.github/workflows/hvm-ci.yml index b476ff278..30d2a3c5a 100644 --- a/.github/workflows/hvm-ci.yml +++ b/.github/workflows/hvm-ci.yml @@ -36,11 +36,11 @@ jobs: working-directory: hvm run: go mod tidy - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: v1.56.2 + version: v1.63.4 github-token: ${{ secrets.GITHUB_TOKEN }} - args: --timeout 10m0s + args: --timeout 20m0s working-directory: hvm skip-pkg-cache: true diff --git a/.github/workflows/provider-ci.yml b/.github/workflows/provider-ci.yml index df8d45fc9..1cf95bad3 100644 --- a/.github/workflows/provider-ci.yml +++ b/.github/workflows/provider-ci.yml @@ -34,11 +34,11 @@ jobs: go-version-file: terraform/provider/go.mod cache: true - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: v1.56.2 + version: v1.63.4 github-token: ${{ secrets.GITHUB_TOKEN }} - args: --timeout 10m0s + args: --timeout 20m0s working-directory: terraform/provider skip-pkg-cache: true diff --git a/.github/workflows/shared-ci.yml b/.github/workflows/shared-ci.yml index d012b01de..3e3970c4f 100644 --- a/.github/workflows/shared-ci.yml +++ b/.github/workflows/shared-ci.yml @@ -37,11 +37,11 @@ jobs: run: | cd shared && go mod tidy - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: v1.56.2 + version: v1.63.4 github-token: ${{ secrets.GITHUB_TOKEN }} - args: --timeout 10m0s + args: --timeout 20m0s working-directory: shared skip-pkg-cache: true From 74a0de568b9fe898de6a730a18cf46d60f91bfcb Mon Sep 17 00:00:00 2001 From: Alex Lokshin Date: Wed, 29 Jan 2025 12:45:30 -0500 Subject: [PATCH 11/11] Update .golangci.yml --- api/.golangci.yml | 50 +++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/api/.golangci.yml b/api/.golangci.yml index 057557d96..69aef50f9 100644 --- a/api/.golangci.yml +++ b/api/.golangci.yml @@ -1,53 +1,31 @@ + +# yaml-language-server: $schema=https://golangci-lint.run/jsonschema/golangci.jsonschema.json linters: enable: - - deadcode - - errcheck - - errorlint - forbidigo - - gci - - gofmt - - goimports - - gosimple - - govet - - ineffassign - - staticcheck - - structcheck - - typecheck - - unused - - varcheck - - whitespace + - gocritic linters-settings: forbidigo: # These are forbidden in non-test files - # If you have mock functions,etc that are meant to be used in tests - # please add them here + # If you have mock functions,etc that are meant to be used in tests please add them here forbid: - - ^fmt\.Errorf$ - ^fmt\.Print.*$ - ^spew\.Dump$ - ^println$ - depguard: - list-type: denylist - include-go-root: true - packages-with-error-message: - - errors: "please use github.com/pkg/errors instead" - - golang.org/x/xerrors: "please use github.com/pkg/errors instead" - - gopkg.in/yaml.v2: "please use gopkg.in/yaml.v3 instead" - additional-guards: - # Do not allow test code into "real" code - - list-type: denylist - include-go-root: false - packages: - - github.com/stretchr/testify - - github.com/happy/pkg/backend/aws/testbackend - ignore-file-rules: - - "**/*_test.go" - - "**/mock/**/*.go" - - "pkg/backend/aws/testbackend/*.go" + issues: + fix: true exclude-rules: # Exclude some linters from running on tests files. - path: _test\.go linters: - forbidigo + +output: + formats: + - format: tab + show-stats: true + +run: + timeout: 20m