Skip to content

Commit a7ef22a

Browse files
johnstcnjohnstcn
committed
chore(dogfood): move dogfood template contents to subdir
1 parent 1a50d33 commit a7ef22a

40 files changed

+53
-11
lines changed

‎.github/dependabot.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ updates:
3737
# Update our Dockerfile.
3838
- package-ecosystem: "docker"
3939
directories:
40-
- "/dogfood/contents"
40+
- "/dogfood/coder/contents"
41+
- "/dogfood/coder-envbuilder/contents"
4142
- "/scripts"
4243
- "/examples/templates/docker/build"
4344
- "/examples/parameters/build"

‎.github/workflows/ci.yaml

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

173173
- name: Get golangci-lint cache dir
174174
run: |
175-
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
175+
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/contents/Dockerfile | cut -d '=' -f 2)
176176
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$linter_ver
177177
dir=$(golangci-lint cache status | awk '/Dir/ { print $2 }')
178178
echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV

‎.github/workflows/dogfood.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
project: b4q6ltmpzh
6969
token: ${{ secrets.DEPOT_TOKEN }}
7070
buildx-fallback: true
71-
context: "{{defaultContext}}:dogfood/contents"
71+
context: "{{defaultContext}}:dogfood/coder/contents"
7272
pull: true
7373
save: true
7474
push: ${{ github.ref == 'refs/heads/main' }}
@@ -113,7 +113,7 @@ jobs:
113113

114114
- name: Terraform init and validate
115115
run: |
116-
cd dogfood
116+
cd dogfood/coder
117117
terraform init -upgrade
118118
terraform validate
119119
cd contents
@@ -133,7 +133,7 @@ jobs:
133133
- name: "Push template"
134134
if: github.ref == 'refs/heads/main'
135135
run: |
136-
cd dogfood
136+
cd dogfood/coder
137137
terraform apply -auto-approve
138138
env:
139139
# Consumed by coderd provider

‎.github/workflows/security.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
# version in the comments will differ. This is also defined in
100100
# ci.yaml.
101101
set -euxo pipefail
102-
cd dogfood/contents
102+
cd dogfood/coder/contents
103103
mkdir -p /usr/local/bin
104104
mkdir -p /usr/local/include
105105

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ lint/ts: site/node_modules/.installed
505505
lint/go:
506506
./scripts/check_enterprise_imports.sh
507507
./scripts/check_codersdk_imports.sh
508-
linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
508+
linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/contents/Dockerfile | cut -d '=' -f 2)
509509
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run
510510
.PHONY: lint/go
511511

@@ -963,5 +963,5 @@ else
963963
endif
964964
.PHONY: test-e2e
965965

966-
dogfood/contents/nix.hash: flake.nix flake.lock
967-
sha256sum flake.nix flake.lock >./dogfood/contents/nix.hash
966+
dogfood/coder/contents/nix.hash: flake.nix flake.lock
967+
sha256sum flake.nix flake.lock >./dogfood/coder/contents/nix.hash

‎dogfood/contents/Dockerfile renamed to ‎dogfood/coder/contents/Dockerfile

File renamed without changes.

‎dogfood/contents/Makefile renamed to ‎dogfood/coder/contents/Makefile

File renamed without changes.

‎dogfood/contents/README.md renamed to ‎dogfood/coder/contents/README.md

File renamed without changes.

‎dogfood/contents/devcontainer.json renamed to ‎dogfood/coder/contents/devcontainer.json

File renamed without changes.

‎dogfood/contents/files/etc/apt/apt.conf.d/80-no-recommends renamed to ‎dogfood/coder/contents/files/etc/apt/apt.conf.d/80-no-recommends

File renamed without changes.

0 commit comments

Comments
 (0)