Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cffc0c6

Browse files
mtojekmtojek
authored
Merge branch 'main' into 17402-fix-warn
2 parents 824724b + 408e19f commit cffc0c6

File tree

335 files changed

+12957
-2146
lines changed

Some content is hidden

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

335 files changed

+12957
-2146
lines changed

‎.devcontainer/filebrowser/install.sh

100644100755
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,15 @@ printf "%sInstalling filebrowser\n\n" "${BOLD}"
88

99
# Check if filebrowser is installed.
1010
if ! command -v filebrowser &>/dev/null; then
11-
curl -fsSL https://raw.githubusercontent.com/filebrowser/get/master/get.sh | bash
11+
VERSION="v2.42.1"
12+
EXPECTED_HASH="7d83c0f077df10a8ec9bfd9bf6e745da5d172c3c768a322b0e50583a6bc1d3cc"
13+
14+
curl -fsSL "https://github.com/filebrowser/filebrowser/releases/download/${VERSION}/linux-amd64-filebrowser.tar.gz" -o /tmp/filebrowser.tar.gz
15+
echo "${EXPECTED_HASH} /tmp/filebrowser.tar.gz" | sha256sum -c
16+
tar -xzf /tmp/filebrowser.tar.gz -C /tmp
17+
sudo mv /tmp/filebrowser /usr/local/bin/
18+
sudo chmod +x /usr/local/bin/filebrowser
19+
rm /tmp/filebrowser.tar.gz
1220
fi
1321

1422
# Create entrypoint.

‎.devcontainer/scripts/post_create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
install_devcontainer_cli() {
4-
npm install -g @devcontainers/cli
4+
npm install -g @devcontainers/cli@0.80.0 --integrity=sha512-w2EaxgjyeVGyzfA/KUEZBhyXqu/5PyWNXcnrXsZOBrt3aN2zyGiHrXoG54TF6K0b5DSCF01Rt5fnIyrCeFzFKw==
55
}
66

77
install_ssh_config() {

‎.gitattributes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ provisionersdk/proto/*.go linguist-generated=true
1515
*.tfstate.json linguist-generated=true
1616
*.tfstate.dot linguist-generated=true
1717
*.tfplan.dot linguist-generated=true
18+
site/e2e/google/protobuf/timestampGenerated.ts
1819
site/e2e/provisionerGenerated.ts linguist-generated=true
20+
site/src/api/countriesGenerated.tsx linguist-generated=true
21+
site/src/api/rbacresourcesGenerated.tsx linguist-generated=true
1922
site/src/api/typesGenerated.ts linguist-generated=true
20-
site/src/pages/SetupPage/countries.tsx linguist-generated=true

‎.github/actions/setup-node/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
- name: Setup Node
1717
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
1818
with:
19-
node-version: 20.16.0
19+
node-version: 20.19.4
2020
# See https://github.com/actions/setup-node#caching-global-packages-data
2121
cache: "pnpm"
2222
cache-dependency-path: ${{ inputs.directory }}/pnpm-lock.yaml

‎.github/workflows/ci.yaml

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,11 @@ jobs:
340340
- name: Disable Spotlight Indexing
341341
if: runner.os == 'macOS'
342342
run: |
343+
enabled=$(sudo mdutil -a -s | grep "Indexing enabled" | wc -l)
344+
if [ $enabled -eq 0 ]; then
345+
echo "Spotlight indexing is already disabled"
346+
exit 0
347+
fi
343348
sudo mdutil -a -i off
344349
sudo mdutil -X /
345350
sudo launchctl bootout system /System/Library/LaunchDaemons/com.apple.metadata.mds.plist
@@ -485,6 +490,12 @@ jobs:
485490
gotestsum --format standard-quiet --packages "$PACKAGES" \
486491
-- -timeout=20m -v -p $NUM_PARALLEL_PACKAGES -parallel=$NUM_PARALLEL_TESTS $TESTCOUNT
487492
493+
- name: Upload failed test db dumps
494+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
495+
with:
496+
name: failed-test-db-dump-${{matrix.os}}
497+
path: "**/*.test.sql"
498+
488499
- name: Upload Go Build Cache
489500
uses: ./.github/actions/test-cache/upload
490501
with:
@@ -783,7 +794,7 @@ jobs:
783794
# the check to pass. This is desired in PRs, but not in mainline.
784795
- name: Publish to Chromatic (non-mainline)
785796
if: github.ref != 'refs/heads/main' && github.repository_owner == 'coder'
786-
uses: chromaui/action@4d8ebd13658d795114f8051e25c28d66f14886c6 # v13.1.2
797+
uses: chromaui/action@58d9ffb36c90c97a02d061544ecc849cc4a242a9 # v13.1.3
787798
env:
788799
NODE_OPTIONS: "--max_old_space_size=4096"
789800
STORYBOOK: true
@@ -815,7 +826,7 @@ jobs:
815826
# infinitely "in progress" in mainline unless we re-review each build.
816827
- name: Publish to Chromatic (mainline)
817828
if: github.ref == 'refs/heads/main' && github.repository_owner == 'coder'
818-
uses: chromaui/action@4d8ebd13658d795114f8051e25c28d66f14886c6 # v13.1.2
829+
uses: chromaui/action@58d9ffb36c90c97a02d061544ecc849cc4a242a9 # v13.1.3
819830
env:
820831
NODE_OPTIONS: "--max_old_space_size=4096"
821832
STORYBOOK: true
@@ -959,7 +970,7 @@ jobs:
959970
- name: Switch XCode Version
960971
uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
961972
with:
962-
xcode-version: "16.0.0"
973+
xcode-version: "16.1.0"
963974

964975
- name: Setup Go
965976
uses: ./.github/actions/setup-go
@@ -1060,6 +1071,27 @@ jobs:
10601071
- name: Setup Go
10611072
uses: ./.github/actions/setup-go
10621073

1074+
- name: Install rcodesign
1075+
run: |
1076+
set -euo pipefail
1077+
wget -O /tmp/rcodesign.tar.gz https://github.com/indygreg/apple-platform-rs/releases/download/apple-codesign%2F0.22.0/apple-codesign-0.22.0-x86_64-unknown-linux-musl.tar.gz
1078+
sudo tar -xzf /tmp/rcodesign.tar.gz \
1079+
-C /usr/bin \
1080+
--strip-components=1 \
1081+
apple-codesign-0.22.0-x86_64-unknown-linux-musl/rcodesign
1082+
rm /tmp/rcodesign.tar.gz
1083+
1084+
- name: Setup Apple Developer certificate
1085+
run: |
1086+
set -euo pipefail
1087+
touch /tmp/{apple_cert.p12,apple_cert_password.txt}
1088+
chmod 600 /tmp/{apple_cert.p12,apple_cert_password.txt}
1089+
echo "$AC_CERTIFICATE_P12_BASE64" | base64 -d > /tmp/apple_cert.p12
1090+
echo "$AC_CERTIFICATE_PASSWORD" > /tmp/apple_cert_password.txt
1091+
env:
1092+
AC_CERTIFICATE_P12_BASE64: ${{ secrets.AC_CERTIFICATE_P12_BASE64 }}
1093+
AC_CERTIFICATE_PASSWORD: ${{ secrets.AC_CERTIFICATE_PASSWORD }}
1094+
10631095
# Necessary for signing Windows binaries.
10641096
- name: Setup Java
10651097
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -1095,7 +1127,7 @@ jobs:
10951127
# Setup GCloud for signing Windows binaries.
10961128
- name: Authenticate to Google Cloud
10971129
id: gcloud_auth
1098-
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
1130+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
10991131
with:
11001132
workload_identity_provider: ${{ secrets.GCP_CODE_SIGNING_WORKLOAD_ID_PROVIDER }}
11011133
service_account: ${{ secrets.GCP_CODE_SIGNING_SERVICE_ACCOUNT }}
@@ -1138,6 +1170,9 @@ jobs:
11381170
CODER_WINDOWS_RESOURCES: "1"
11391171
CODER_SIGN_GPG: "1"
11401172
CODER_GPG_RELEASE_KEY_BASE64: ${{ secrets.GPG_RELEASE_KEY_BASE64 }}
1173+
CODER_SIGN_DARWIN: "1"
1174+
AC_CERTIFICATE_FILE: /tmp/apple_cert.p12
1175+
AC_CERTIFICATE_PASSWORD_FILE: /tmp/apple_cert_password.txt
11411176
EV_KEY: ${{ secrets.EV_KEY }}
11421177
EV_KEYSTORE: ${{ secrets.EV_KEYSTORE }}
11431178
EV_TSA_URL: ${{ secrets.EV_TSA_URL }}
@@ -1396,7 +1431,7 @@ jobs:
13961431
fetch-depth: 0
13971432

13981433
- name: Authenticate to Google Cloud
1399-
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
1434+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
14001435
with:
14011436
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
14021437
service_account: [email protected]

‎.github/workflows/docs-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup Node
2929
uses: ./.github/actions/setup-node
3030

31-
- uses: tj-actions/changed-files@055970845dd036d7345da7399b7e89f2e10f2b04 # v45.0.7
31+
- uses: tj-actions/changed-files@c2ca2493190021783138cb8aac49bcee14b4bb89 # v45.0.7
3232
id: changed-files
3333
with:
3434
files: |

‎.github/workflows/dogfood.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262

6363
- name: Get branch name
6464
id: branch-name
65-
uses: tj-actions/branch-names@dde14ac574a8b9b1cedc59a1cf312788af43d8d8 # v8.2.1
65+
uses: tj-actions/branch-names@5250492686b253f06fa55861556d1027b067aeb5 # v9.0.2
6666

6767
- name: "Branch name to Docker tag name"
6868
id: docker-tag-name
@@ -129,7 +129,7 @@ jobs:
129129
uses: ./.github/actions/setup-tf
130130

131131
- name: Authenticate to Google Cloud
132-
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
132+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
133133
with:
134134
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
135135
service_account: [email protected]

‎.github/workflows/nightly-gauntlet.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- windows-2022
2828
steps:
2929
- name: Harden Runner
30-
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
30+
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
3131
with:
3232
egress-policy: audit
3333

@@ -37,6 +37,11 @@ jobs:
3737
- name: Disable Spotlight Indexing
3838
if: runner.os == 'macOS'
3939
run: |
40+
enabled=$(sudo mdutil -a -s | grep "Indexing enabled" | wc -l)
41+
if [ $enabled -eq 0 ]; then
42+
echo "Spotlight indexing is already disabled"
43+
exit 0
44+
fi
4045
sudo mdutil -a -i off
4146
sudo mdutil -X /
4247
sudo launchctl bootout system /System/Library/LaunchDaemons/com.apple.metadata.mds.plist

‎.github/workflows/release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Switch XCode Version
6161
uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
6262
with:
63-
xcode-version: "16.0.0"
63+
xcode-version: "16.1.0"
6464

6565
- name: Setup Go
6666
uses: ./.github/actions/setup-go
@@ -286,7 +286,7 @@ jobs:
286286
# Setup GCloud for signing Windows binaries.
287287
- name: Authenticate to Google Cloud
288288
id: gcloud_auth
289-
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
289+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
290290
with:
291291
workload_identity_provider: ${{ secrets.GCP_CODE_SIGNING_WORKLOAD_ID_PROVIDER }}
292292
service_account: ${{ secrets.GCP_CODE_SIGNING_SERVICE_ACCOUNT }}
@@ -635,7 +635,7 @@ jobs:
635635
run: ls -lh build
636636

637637
- name: Publish Coder CLI binaries and detached signatures to GCS
638-
if: ${{ !inputs.dry_run && github.ref == 'refs/heads/main' && github.repository_owner == 'coder'}}
638+
if: ${{ !inputs.dry_run }}
639639
run: |
640640
set -euxo pipefail
641641
@@ -655,7 +655,7 @@ jobs:
655655
detached_signature="${binary}.asc"
656656
gcloud storage cp "./site/out/bin/${binary}" "gs://releases.coder.com/coder-cli/${version}/${binary}"
657657
gcloud storage cp "./site/out/bin/${detached_signature}" "gs://releases.coder.com/coder-cli/${version}/${detached_signature}"
658-
done
658+
done
659659
660660
- name: Publish release
661661
run: |
@@ -696,7 +696,7 @@ jobs:
696696
CODER_GPG_RELEASE_KEY_BASE64: ${{ secrets.GPG_RELEASE_KEY_BASE64 }}
697697

698698
- name: Authenticate to Google Cloud
699-
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
699+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
700700
with:
701701
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_ID_PROVIDER }}
702702
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}

‎.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747

4848
# Upload the results to GitHub's code scanning dashboard.
4949
- name: "Upload to code-scanning"
50-
uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
50+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
5151
with:
5252
sarif_file: results.sarif

0 commit comments

Comments
 (0)