Skip to content

Commit f270cf6

Browse files
Merge branch 'main' into link-protection-trusted-domains
2 parents a6e4529 + 73a92be commit f270cf6

File tree

94 files changed

+5748
-1467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+5748
-1467
lines changed

.github/scripts/version-bump.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,19 @@ update_readme_version() {
7777
in_target_module = 0
7878
}
7979
}
80-
/version.*=.*"/ {
80+
/^[[:space:]]*version[[:space:]]*=/ {
8181
if (in_target_module) {
82-
gsub(/version[[:space:]]*=[[:space:]]*"[^"]*"/, "version = \"" new_version "\"")
82+
match($0, /^[[:space]]*/
83+
indent = substr($0, 1, RLENGTH)
84+
print indent "version = \"" new_version "\""
8385
in_target_module = 0
86+
next
8487
}
8588
}
8689
{ print }
8790
' "$readme_path" > "${readme_path}.tmp" && mv "${readme_path}.tmp" "$readme_path"
8891
return 0
89-
elif grep -q 'version\s*=\s*"' "$readme_path"; then
92+
elif grep -q '^[[:space:]]*version[[:space:]]*=' "$readme_path"; then
9093
echo "⚠️ Found version references but no module source match for $namespace/$module_name"
9194
return 1
9295
fi
@@ -148,9 +151,9 @@ main() {
148151
local current_version
149152

150153
if [ -z "$latest_tag" ]; then
151-
if [ -f "$readme_path" ] && grep -q 'version\s*=\s*"' "$readme_path"; then
154+
if [ -f "$readme_path" ] && grep -q '^[[:space:]]*version[[:space:]]*=' "$readme_path"; then
152155
local readme_version
153-
readme_version=$(grep 'version\s*=\s*"' "$readme_path" | head -1 | sed 's/.*version\s*=\s*"\([^"]*\)".*/\1/')
156+
readme_version=$(awk '/^[[:space:]]*version[[:space:]]*=/ { match($0, /"[^"]*"/); print substr($0, RSTART+1, RLENGTH-2); exit }' "$readme_path")
154157
echo "No git tag found, but README shows version: $readme_version"
155158

156159
if ! validate_version "$readme_version"; then

.github/typos.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Hashi = "Hashi"
55
HashiCorp = "HashiCorp"
66
mavrickrishi = "mavrickrishi" # Username
77
mavrick = "mavrick" # Username
8+
inh = "inh" # Option in setpriv command
9+
exportfs = "exportfs" # nfs related binary
810

911
[files]
1012
extend-exclude = ["registry/coder/templates/aws-devcontainer/architecture.svg"] #False positive

.github/workflows/ci.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
- 'tsconfig.json'
2828
- '.github/workflows/ci.yaml'
2929
- 'scripts/ts_test_auto.sh'
30+
- 'scripts/terraform_test_all.sh'
31+
- 'scripts/terraform_validate.sh'
3032
modules:
3133
- 'registry/**/modules/**'
3234
all:
@@ -49,10 +51,18 @@ jobs:
4951
ALL_CHANGED_FILES: ${{ steps.filter.outputs.all_files }}
5052
SHARED_CHANGED: ${{ steps.filter.outputs.shared }}
5153
MODULE_CHANGED_FILES: ${{ steps.filter.outputs.modules_files }}
52-
run: ./scripts/ts_test_auto.sh
54+
run: bun tstest
5355
- name: Run Terraform tests
54-
run: ./scripts/terraform_test_all.sh
56+
env:
57+
ALL_CHANGED_FILES: ${{ steps.filter.outputs.all_files }}
58+
SHARED_CHANGED: ${{ steps.filter.outputs.shared }}
59+
MODULE_CHANGED_FILES: ${{ steps.filter.outputs.modules_files }}
60+
run: bun tftest
5561
- name: Run Terraform Validate
62+
env:
63+
ALL_CHANGED_FILES: ${{ steps.filter.outputs.all_files }}
64+
SHARED_CHANGED: ${{ steps.filter.outputs.shared }}
65+
MODULE_CHANGED_FILES: ${{ steps.filter.outputs.modules_files }}
5666
run: bun terraform-validate
5767
validate-style:
5868
name: Check for typos and unformatted code
@@ -72,7 +82,7 @@ jobs:
7282
- name: Validate formatting
7383
run: bun fmt:ci
7484
- name: Check for typos
75-
uses: crate-ci/typos@v1.38.1
85+
uses: crate-ci/typos@v1.39.2
7686
with:
7787
config: .github/typos.toml
7888
validate-readme-files:

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ jobs:
1919
with:
2020
go-version: stable
2121
- name: golangci-lint
22-
uses: golangci/golangci-lint-action@v8
22+
uses: golangci/golangci-lint-action@v9
2323
with:
2424
version: v2.1

.icons/cmux.svg

Lines changed: 47 additions & 0 deletions
Loading

.icons/copyparty.svg

Lines changed: 210 additions & 0 deletions
Loading

.icons/folder.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)