diff --git a/.github/scripts/check.sh b/.github/scripts/check.sh index 01bf3e4..49c817a 100755 --- a/.github/scripts/check.sh +++ b/.github/scripts/check.sh @@ -196,7 +196,8 @@ else # If a module is down, force a reployment to try getting things back online # ASAP - force_redeploy_registry + # EDIT: registry.coder.com is no longer hosted on vercel + #force_redeploy_registry fi exit "${status}" diff --git a/.github/workflows/deploy-registry.yaml b/.github/workflows/deploy-registry.yaml new file mode 100644 index 0000000..0a56b5c --- /dev/null +++ b/.github/workflows/deploy-registry.yaml @@ -0,0 +1,37 @@ +name: deploy-registry + +on: + push: + branches: + - main + +jobs: + deploy: + runs-on: ubuntu-latest + + # Set id-token permission for gcloud + # Adding a comment because retriggering the build manually hung? I am the lord of devops and you will bend? + permissions: + contents: read + id-token: write + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Authenticate to Google Cloud + uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f + with: + workload_identity_provider: projects/309789351055/locations/global/workloadIdentityPools/github-actions/providers/github + service_account: registry-v2-github@coder-registry-1.iam.gserviceaccount.com + + - name: Set up Google Cloud SDK + uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a + + # For the time being, let's have the first couple merges to main in modules deploy a new version + # to *dev*. Once we review and make sure everything's working, we can deploy a new version to *main*. + # Maybe in the future we could automate this based on the result of E2E tests. + - name: Deploy to dev.registry.coder.com + run: | + gcloud builds triggers run 29818181-126d-4f8a-a937-f228b27d3d34 --branch dev + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 6d6f5a2..a2e63be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ .terraform* node_modules *.tfstate -*.tfstate.lock.info \ No newline at end of file +*.tfstate.lock.info + +# Ignore generated credentials from google-github-actions/auth +gha-creds-*.json \ No newline at end of file diff --git a/vscode-web/README.md b/vscode-web/README.md index a147006..a50fe2b 100644 --- a/vscode-web/README.md +++ b/vscode-web/README.md @@ -15,7 +15,7 @@ Automatically install [Visual Studio Code Server](https://code.visualstudio.com/ module "vscode-web" { count = data.coder_workspace.me.start_count source = "registry.coder.com/modules/vscode-web/coder" - version = "1.0.22" + version = "1.0.26" agent_id = coder_agent.example.id accept_license = true } @@ -31,7 +31,7 @@ module "vscode-web" { module "vscode-web" { count = data.coder_workspace.me.start_count source = "registry.coder.com/modules/vscode-web/coder" - version = "1.0.22" + version = "1.0.26" agent_id = coder_agent.example.id install_prefix = "/home/coder/.vscode-web" folder = "/home/coder" @@ -45,7 +45,7 @@ module "vscode-web" { module "vscode-web" { count = data.coder_workspace.me.start_count source = "registry.coder.com/modules/vscode-web/coder" - version = "1.0.22" + version = "1.0.26" agent_id = coder_agent.example.id extensions = ["github.copilot", "ms-python.python", "ms-toolsai.jupyter"] accept_license = true @@ -60,7 +60,7 @@ Configure VS Code's [settings.json](https://code.visualstudio.com/docs/getstarte module "vscode-web" { count = data.coder_workspace.me.start_count source = "registry.coder.com/modules/vscode-web/coder" - version = "1.0.22" + version = "1.0.26" agent_id = coder_agent.example.id extensions = ["dracula-theme.theme-dracula"] settings = { diff --git a/vscode-web/main.tf b/vscode-web/main.tf index 207450e..4a2f04e 100644 --- a/vscode-web/main.tf +++ b/vscode-web/main.tf @@ -92,7 +92,7 @@ variable "order" { } variable "settings" { - type = map(string) + type = any description = "A map of settings to apply to VS Code web." default = {} }