From 76af5b22114072e6abc35d99d7cab5d5c06009b7 Mon Sep 17 00:00:00 2001 From: Kalle Fagerberg Date: Wed, 27 Mar 2024 12:52:37 +0100 Subject: [PATCH] Generate with correct version --- .github/workflows/go-templ.yml | 10 ++-------- Makefile | 2 +- go.mod | 4 ++++ go.sum | 11 +++++++++++ main.go | 2 +- templates/components/alerts_templ.go | 2 +- templates/components/breadcrumbs_templ.go | 2 +- templates/components/codeblock_templ.go | 2 +- templates/components/link_templ.go | 2 +- templates/pages/config_templ.go | 2 +- templates/pages/errors_templ.go | 2 +- templates/pages/index_templ.go | 2 +- templates/pages/layout_templ.go | 2 +- templates/pages/packages_createpr_templ.go | 2 +- templates/pages/packages_item_templ.go | 2 +- templates/pages/packages_list_templ.go | 2 +- 16 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.github/workflows/go-templ.yml b/.github/workflows/go-templ.yml index 06656ec..f940ce5 100644 --- a/.github/workflows/go-templ.yml +++ b/.github/workflows/go-templ.yml @@ -21,14 +21,8 @@ jobs: with: go-version-file: go.mod - - name: Install templ - run: | - TEMPL_VERISON=$(grep --perl-regexp --only-matching --max-count 1 'github.com/a-h/templ\s*\K(v.*)' go.mod) - set -x - go install github.com/a-h/templ/cmd/templ@$TEMPL_VERSION - - - name: Run templ - run: templ generate + - name: Run templ generate + run: make generate - name: Fail on git diff run: git diff --exit-code diff --git a/Makefile b/Makefile index 44f31c6..48a15ba 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ jelease.schema.json: pkg/config/*.go cmd/config_schema.go .PHONY: generate generate: - go generate + go run github.com/a-h/templ/cmd/templ@$(shell go list -m -f '{{ .Version }}' github.com/a-h/templ) generate .PHONY: test test: diff --git a/go.mod b/go.mod index 7e8df02..a80aa6b 100644 --- a/go.mod +++ b/go.mod @@ -28,11 +28,14 @@ require ( require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect + github.com/a-h/parse v0.0.0-20240121214402-3caf7543159a // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/buger/jsonparser v1.1.1 // indirect github.com/bytedance/sonic v1.10.2 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.0 // indirect + github.com/cli/browser v1.2.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect @@ -71,6 +74,7 @@ require ( golang.org/x/arch v0.5.0 // indirect golang.org/x/crypto v0.16.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect + golang.org/x/mod v0.13.0 // indirect golang.org/x/net v0.19.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/go.sum b/go.sum index 60c0672..0813159 100644 --- a/go.sum +++ b/go.sum @@ -41,6 +41,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g= github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c h1:kMFnB0vCcX7IL/m9Y5LO+KQYv+t1CQOiFe6+SV2J7bE= github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/a-h/parse v0.0.0-20240121214402-3caf7543159a h1:vlmAfVwFK9sRpDlJyuHY8htP+KfGHB2VH02u0SoIufk= +github.com/a-h/parse v0.0.0-20240121214402-3caf7543159a/go.mod h1:3mnrkvGpurZ4ZrTDbYU84xhwXW2TjTKShSwjRi2ihfQ= github.com/a-h/templ v0.2.648 h1:A1ggHGIE7AONOHrFaDTM8SrqgqHL6fWgWCijQ21Zy9I= github.com/a-h/templ v0.2.648/go.mod h1:SA7mtYwVEajbIXFRh3vKdYm/4FYyLQAtPH1+KxzGPA8= github.com/andygrunwald/go-jira v1.16.0 h1:PU7C7Fkk5L96JvPc6vDVIrd99vdPnYudHu4ju2c2ikQ= @@ -57,6 +59,8 @@ github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= @@ -67,6 +71,8 @@ github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/cli/browser v1.2.0 h1:yvU7e9qf97kZqGFX6n2zJPHsmSObY9ske+iCvKelvXg= +github.com/cli/browser v1.2.0/go.mod h1:xFFnXLVcAyW9ni0cuo6NnrbCP75JxJ0RO7VtCBiH/oI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= @@ -356,6 +362,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -453,6 +461,7 @@ golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -543,6 +552,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/main.go b/main.go index 8ab7677..ad36e82 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ import ( "gopkg.in/yaml.v3" ) -//go:generate templ generate +//go:generate make generate //go:embed jelease.yaml var defaultConfigYAML []byte diff --git a/templates/components/alerts_templ.go b/templates/components/alerts_templ.go index 9b59324..acd77ce 100644 --- a/templates/components/alerts_templ.go +++ b/templates/components/alerts_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/templates/components/breadcrumbs_templ.go b/templates/components/breadcrumbs_templ.go index 546e1c1..df8d4a1 100644 --- a/templates/components/breadcrumbs_templ.go +++ b/templates/components/breadcrumbs_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/templates/components/codeblock_templ.go b/templates/components/codeblock_templ.go index 62d6e2f..24d8481 100644 --- a/templates/components/codeblock_templ.go +++ b/templates/components/codeblock_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/templates/components/link_templ.go b/templates/components/link_templ.go index 035ced1..e90de6e 100644 --- a/templates/components/link_templ.go +++ b/templates/components/link_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package components //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/templates/pages/config_templ.go b/templates/pages/config_templ.go index d9880c1..87efb0e 100644 --- a/templates/pages/config_templ.go +++ b/templates/pages/config_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package pages //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/templates/pages/errors_templ.go b/templates/pages/errors_templ.go index a8b5e00..6fe2709 100644 --- a/templates/pages/errors_templ.go +++ b/templates/pages/errors_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package pages //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/templates/pages/index_templ.go b/templates/pages/index_templ.go index c3c544e..cb1e379 100644 --- a/templates/pages/index_templ.go +++ b/templates/pages/index_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package pages //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/templates/pages/layout_templ.go b/templates/pages/layout_templ.go index 3494e99..fa2cb1c 100644 --- a/templates/pages/layout_templ.go +++ b/templates/pages/layout_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package pages //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/templates/pages/packages_createpr_templ.go b/templates/pages/packages_createpr_templ.go index cdb5378..880f2ee 100644 --- a/templates/pages/packages_createpr_templ.go +++ b/templates/pages/packages_createpr_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package pages //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/templates/pages/packages_item_templ.go b/templates/pages/packages_item_templ.go index ad4dd7f..2b2e2d0 100644 --- a/templates/pages/packages_item_templ.go +++ b/templates/pages/packages_item_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package pages //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/templates/pages/packages_list_templ.go b/templates/pages/packages_list_templ.go index 5206a12..b1571e6 100644 --- a/templates/pages/packages_list_templ.go +++ b/templates/pages/packages_list_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.646 +// templ: version: v0.2.648 package pages //lint:file-ignore SA4006 This context is only used if a nested component is present.