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

Skip to content

Commit 23e5d29

Browse files
Kira-PilotKira-Pilot
committed
Merge remote-tracking branch 'origin/main' into add-audit-links/kira-pilot
2 parents 6465f3e + fa64155 commit 23e5d29

File tree

190 files changed

+7185
-1788
lines changed

Some content is hidden

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

190 files changed

+7185
-1788
lines changed

‎.github/workflows/coder.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
with:
9797
go-version: "~1.19"
9898
- name: golangci-lint
99-
uses: golangci/[email protected].0
99+
uses: golangci/[email protected].1
100100
with:
101101
version: v1.48.0
102102

@@ -336,7 +336,7 @@ jobs:
336336
echo ::set-output name=cover::false
337337
fi
338338
set -x
339-
gotestsum --junitfile="gotests.xml" --packages="./..." -- -parallel=8 -timeout=3m -short -failfast $COVERAGE_FLAGS
339+
gotestsum --junitfile="gotests.xml" --packages="./..." --debug -- -parallel=8 -timeout=3m -short -failfast $COVERAGE_FLAGS
340340
341341
- uses: codecov/codecov-action@v3
342342
# This action has a tendency to error out unexpectedly, it has
@@ -428,7 +428,7 @@ jobs:
428428
fetch-depth: 0
429429

430430
- name: Authenticate to Google Cloud
431-
uses: google-github-actions/auth@v0
431+
uses: google-github-actions/auth@v1
432432
with:
433433
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
434434
service_account: [email protected]

‎.github/workflows/dependabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ jobs:
99
permissions:
1010
pull-requests: write
1111
steps:
12-
- uses: hmarr/auto-approve-action@v2
12+
- uses: hmarr/auto-approve-action@v3
1313
if: github.actor == 'dependabot[bot]'

‎.github/workflows/dogfood.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- name: Get branch name
1919
id: branch-name
20-
uses: tj-actions/branch-names@v6.2
20+
uses: tj-actions/branch-names@v6.3
2121

2222
- name: "Branch name to Docker tag name"
2323
id: docker-tag-name

‎.github/workflows/packages.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
name: Submit Packages
22
on:
3-
release:
4-
types: [published]
5-
3+
workflow_run:
4+
workflows: [release]
5+
types:
6+
- completed
67
env:
78
CODER_VERSION: "${{ github.event.release.tag_name }}"
89

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
171171

172172
- name: Authenticate to Google Cloud
173-
uses: google-github-actions/auth@v0
173+
uses: google-github-actions/auth@v1
174174
with:
175175
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_ID_PROVIDER }}
176176
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}

‎.github/workflows/stale.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
with:
1818
stale-issue-label: 'stale'
1919
stale-pr-label: 'stale'
20-
exempt-issue-labels: 'never stale'
21-
exempt-pr-labels: 'never stale'
2220
# Pull Requests become stale more quickly due to merge conflicts.
2321
# Also, we promote minimizing WIP.
2422
days-before-pr-stale: 7

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ vendor
1414
.eslintcache
1515
yarn-error.log
1616
gotests.coverage
17+
gotests.xml
1718
.idea
1819
.gitpod.yml
1920
.DS_Store

‎.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
"slogtest",
108108
"sourcemapped",
109109
"Srcs",
110+
"stdbuf",
110111
"stretchr",
111112
"STTY",
112113
"stuntest",
@@ -128,6 +129,7 @@
128129
"tfplan",
129130
"tfstate",
130131
"tios",
132+
"tmpdir",
131133
"tparallel",
132134
"trialer",
133135
"trimprefix",

‎Makefile

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -399,13 +399,14 @@ gen: \
399399
coderd/database/querier.go \
400400
provisionersdk/proto/provisioner.pb.go \
401401
provisionerd/proto/provisionerd.pb.go \
402-
site/src/api/typesGenerated.ts
402+
site/src/api/typesGenerated.ts \
403+
docs/admin/prometheus.md
403404
.PHONY: gen
404405

405406
# Mark all generated files as fresh so make thinks they're up-to-date. This is
406407
# used during releases so we don't run generation scripts.
407408
gen/mark-fresh:
408-
files="coderd/database/dump.sql coderd/database/querier.go provisionersdk/proto/provisioner.pb.go provisionerd/proto/provisionerd.pb.go site/src/api/typesGenerated.ts"
409+
files="coderd/database/dump.sql coderd/database/querier.go provisionersdk/proto/provisioner.pb.go provisionerd/proto/provisionerd.pb.go site/src/api/typesGenerated.ts docs/admin/prometheus.md"
409410
for file in $$files; do
410411
echo "$$file"
411412
if [ ! -f "$$file" ]; then
@@ -448,6 +449,15 @@ site/src/api/typesGenerated.ts: scripts/apitypings/main.go $(shell find codersdk
448449
cd site
449450
yarn run format:types
450451

452+
docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
453+
go run scripts/metricsdocgen/main.go
454+
cd site
455+
ifdef CI
456+
yarn run format:check
457+
else
458+
yarn run format:write
459+
endif
460+
451461
update-golden-files: cli/testdata/.gen-golden
452462
.PHONY: update-golden-files
453463

@@ -457,7 +467,7 @@ cli/testdata/.gen-golden: $(wildcard cli/testdata/*.golden) $(GO_SRC_FILES)
457467
touch "$@"
458468

459469
test: test-clean
460-
gotestsum -- -v -short ./...
470+
gotestsum --debug -- -v -short ./...
461471
.PHONY: test
462472

463473
# When updating -timeout for this test, keep in sync with

0 commit comments

Comments
 (0)