Skip to content

Commit b1315f4

Browse files
35C4n0r35C4n0r
authored
Merge branch 'main' into fix-amp-module-1
2 parents 7295399 + faff2be commit b1315f4

File tree

29 files changed

+366
-64
lines changed

29 files changed

+366
-64
lines changed

‎.github/scripts/version-bump.sh‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,38 @@ update_readme_version() {
7070
if grep -q "source.*${module_source}" "$readme_path"; then
7171
echo "Updating version references for $namespace/$module_name in $readme_path"
7272
awk -v module_source="$module_source" -v new_version="$new_version" '
73-
/source.*=.*/ {
74-
if ($0 ~ module_source) {
75-
in_target_module = 1
76-
} else {
77-
in_target_module = 0
78-
}
73+
/^[[:space:]]*module[[:space:]]/ {
74+
in_module_block = 1
75+
module_content = $0 "\n"
76+
module_has_target_source = 0
77+
next
7978
}
80-
/^[[:space:]]*version[[:space:]]*=/ {
81-
if (in_target_module) {
82-
match($0, /^[[:space]]*/
83-
indent = substr($0, 1, RLENGTH)
84-
print indent "version = \"" new_version "\""
85-
in_target_module = 0
79+
in_module_block {
80+
module_content = module_content $0 "\n"
81+
if ($0 ~ /source.*=/ && $0 ~ module_source) {
82+
module_has_target_source = 1
83+
}
84+
if ($0 ~ /^[[:space:]]*}[[:space:]]*$/) {
85+
in_module_block = 0
86+
if (module_has_target_source) {
87+
num_lines = split(module_content, lines, "\n")
88+
for (i = 1; i <= num_lines; i++) {
89+
line = lines[i]
90+
if (line ~ /^[[:space:]]*version[[:space:]]*=/) {
91+
match(line, /^[[:space:]]*/)
92+
indent = substr(line, 1, RLENGTH)
93+
printf "%sversion = \"%s\"\n", indent, new_version
94+
} else {
95+
print line
96+
}
97+
}
98+
} else {
99+
printf "%s", module_content
100+
}
101+
module_content = ""
86102
next
87103
}
104+
next
88105
}
89106
{ print }
90107
' "$readme_path" > "${readme_path}.tmp" && mv "${readme_path}.tmp" "$readme_path"

‎.github/workflows/check_registry_site_health.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v6
1515

1616
- name: Run check.sh
1717
run: |

‎.github/workflows/ci.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check out code
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@v6
1616
- name: Detect changed files
1717
uses: dorny/paths-filter@v3
1818
id: filter
@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ubuntu-latest
7070
steps:
7171
- name: Check out code
72-
uses: actions/checkout@v5
72+
uses: actions/checkout@v6
7373
- name: Install Bun
7474
uses: oven-sh/setup-bun@v2
7575
with:
@@ -93,11 +93,11 @@ jobs:
9393
needs: validate-style
9494
steps:
9595
- name: Check out code
96-
uses: actions/checkout@v5
96+
uses: actions/checkout@v6
9797
- name: Set up Go
9898
uses: actions/setup-go@v6
9999
with:
100-
go-version: "1.23.2"
100+
go-version: "1.24.0"
101101
- name: Validate contributors
102102
run: go build ./cmd/readmevalidation && ./readmevalidation
103103
- name: Remove build file artifact

‎.github/workflows/deploy-registry.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Checkout code
31-
uses: actions/checkout@v5
31+
uses: actions/checkout@v6
3232
- name: Authenticate with Google Cloud
3333
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093
3434
with:

‎.github/workflows/golangci-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: lint
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818
- uses: actions/setup-go@v6
1919
with:
2020
go-version: stable

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v5
17+
uses: actions/checkout@v6
1818
with:
1919
fetch-depth: 0
2020
persist-credentials: false

‎.github/workflows/version-bump.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
issues: write
2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v6
2424
with:
2525
fetch-depth: 0
2626
token: ${{ secrets.GITHUB_TOKEN }}

‎.icons/positron.svg‎

Lines changed: 12 additions & 0 deletions
Loading

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module coder.com/coder-registry
22

3-
go 1.23.2
3+
go 1.24.0
44

55
require (
66
cdr.dev/slog v1.6.1
@@ -20,7 +20,7 @@ require (
2020
github.com/rivo/uniseg v0.4.4 // indirect
2121
go.opentelemetry.io/otel v1.16.0 // indirect
2222
go.opentelemetry.io/otel/trace v1.16.0 // indirect
23-
golang.org/x/crypto v0.35.0 // indirect
24-
golang.org/x/sys v0.30.0 // indirect
25-
golang.org/x/term v0.29.0 // indirect
23+
golang.org/x/crypto v0.45.0 // indirect
24+
golang.org/x/sys v0.38.0 // indirect
25+
golang.org/x/term v0.37.0 // indirect
2626
)

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiM
5151
go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
5252
go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
5353
go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
54-
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
55-
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
56-
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
57-
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
54+
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
55+
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
56+
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
57+
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
5858
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
59-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
60-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
61-
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
62-
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
63-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
64-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
59+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
60+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
61+
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
62+
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
63+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
64+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
6565
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
6666
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
6767
google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e h1:xIXmWJ303kJCuogpj0bHq+dcjcZHU+XFyc1I0Yl9cRg=

0 commit comments

Comments
 (0)