Skip to content

Commit 1919df7

Browse files
stirbystirby
authored
Merge branch 'main' into docs-faq-optional-coder-app
2 parents f00f8c6 + d708ac7 commit 1919df7

File tree

287 files changed

+8895
-4383
lines changed

Some content is hidden

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

287 files changed

+8895
-4383
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ runs:
77
- name: Setup sqlc
88
uses: sqlc-dev/setup-sqlc@v4
99
with:
10-
sqlc-version: "1.24.0"
10+
sqlc-version: "1.25.0"

‎.github/dependabot.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,12 @@ updates:
3838
commit-message:
3939
prefix: "chore"
4040
labels: []
41+
open-pull-requests-limit: 15
4142
ignore:
4243
# Ignore patch updates for all dependencies
4344
- dependency-name: "*"
4445
update-types:
4546
- version-update:semver-patch
46-
groups:
47-
go:
48-
patterns:
49-
- "*"
5047

5148
# Update our Dockerfile.
5249
- package-ecosystem: "docker"

‎.github/workflows/ci.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
142142
# Check for any typos
143143
- name: Check for typos
144-
uses: crate-ci/typos@v1.16.26
144+
uses: crate-ci/typos@v1.17.0
145145
with:
146146
config: .github/workflows/typos.toml
147147

@@ -188,7 +188,7 @@ jobs:
188188
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
189189
go install golang.org/x/tools/cmd/goimports@latest
190190
go install github.com/mikefarah/yq/v4@v4.30.6
191-
go install github.com/golang/mock/mockgen@v1.6.0
191+
go install go.uber.org/mock/mockgen@v0.4.0
192192
193193
- name: Install Protoc
194194
run: |
@@ -221,7 +221,7 @@ jobs:
221221
uses: ./.github/actions/setup-node
222222

223223
- name: Setup Go
224-
uses: buildjet/setup-go@v4
224+
uses: buildjet/setup-go@v5
225225
with:
226226
# This doesn't need caching. It's super fast anyways!
227227
cache: false
@@ -450,7 +450,7 @@ jobs:
450450
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
451451
go install golang.org/x/tools/cmd/goimports@latest
452452
go install github.com/mikefarah/yq/v4@v4.30.6
453-
go install github.com/golang/mock/mockgen@v1.6.0
453+
go install go.uber.org/mock/mockgen@v0.4.0
454454
455455
- name: Install Protoc
456456
run: |
@@ -592,7 +592,7 @@ jobs:
592592
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
593593
go install golang.org/x/tools/cmd/goimports@latest
594594
go install github.com/mikefarah/yq/v4@v4.30.6
595-
go install github.com/golang/mock/mockgen@v1.6.0
595+
go install go.uber.org/mock/mockgen@v0.4.0
596596
597597
- name: Setup sqlc
598598
uses: ./.github/actions/setup-sqlc

‎.github/workflows/dogfood.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ jobs:
3535
- name: Set up Depot CLI
3636
uses: depot/setup-action@v1
3737

38+
- name: Set up Docker Buildx
39+
uses: docker/setup-buildx-action@v3
40+
3841
- name: Login to DockerHub
3942
if: github.ref == 'refs/heads/main'
4043
uses: docker/login-action@v3
@@ -47,6 +50,7 @@ jobs:
4750
with:
4851
project: b4q6ltmpzh
4952
token: ${{ secrets.DEPOT_TOKEN }}
53+
buildx-fallback: true
5054
context: "{{defaultContext}}:dogfood"
5155
pull: true
5256
push: ${{ github.ref == 'refs/heads/main' }}
@@ -75,7 +79,7 @@ jobs:
7579
7680
- name: "Push template"
7781
run: |
78-
./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE"
82+
./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE" --variable jfrog_url=${{ secrets.JFROG_URL }}
7983
env:
8084
# Consumed by Coder CLI
8185
CODER_URL: https://dev.coder.com

‎.github/workflows/pr-deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ jobs:
416416
417417
# Create template
418418
cd ./.github/pr-deployments/template
419-
coder templates create -y --variable namespace=pr${{ env.PR_NUMBER }} kubernetes
419+
coder templates push -y --variable namespace=pr${{ env.PR_NUMBER }} kubernetes
420420
421421
# Create workspace
422422
coder create --template="kubernetes" kube --parameter cpu=2 --parameter memory=4 --parameter home_disk_size=2 -y

‎.github/workflows/security.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
- name: Install yq
7676
run: go run github.com/mikefarah/yq/v4@v4.30.6
7777
- name: Install mockgen
78-
run: go install github.com/golang/mock/mockgen@v1.6.0
78+
run: go install go.uber.org/mock/mockgen@v0.4.0
7979
- name: Install protoc-gen-go
8080
run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30
8181
- name: Install protoc-gen-go-drpc
@@ -122,7 +122,7 @@ jobs:
122122
image_name: ${{ steps.build.outputs.image }}
123123

124124
- name: Run Trivy vulnerability scanner
125-
uses: aquasecurity/trivy-action@91713af97dc80187565512baba96e4364e983601
125+
uses: aquasecurity/trivy-action@d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca
126126
with:
127127
image-ref: ${{ steps.build.outputs.image }}
128128
format: sarif

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"idtoken",
6161
"Iflag",
6262
"incpatch",
63+
"initialisms",
6364
"ipnstate",
6465
"isatty",
6566
"Jobf",

‎agent/agent_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"time"
2828

2929
"github.com/bramvdbogaerde/go-scp"
30-
"github.com/golang/mock/gomock"
3130
"github.com/google/uuid"
3231
"github.com/pion/udp"
3332
"github.com/pkg/sftp"
@@ -37,6 +36,7 @@ import (
3736
"github.com/stretchr/testify/assert"
3837
"github.com/stretchr/testify/require"
3938
"go.uber.org/goleak"
39+
"go.uber.org/mock/gomock"
4040
"golang.org/x/crypto/ssh"
4141
"golang.org/x/exp/slices"
4242
"golang.org/x/xerrors"

‎agent/agentproc/agentproctest/syscallermock.go

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎agent/agentproc/proc_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"syscall"
66
"testing"
77

8-
"github.com/golang/mock/gomock"
98
"github.com/spf13/afero"
109
"github.com/stretchr/testify/require"
10+
"go.uber.org/mock/gomock"
1111
"golang.org/x/xerrors"
1212

1313
"github.com/coder/coder/v2/agent/agentproc"

0 commit comments

Comments
 (0)