Update gitpod/images to use main branch (conda#11645)

xylar · Jul 21, 2022 · b47df94 · b47df94
1 parent b525800
commit b47df94
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.devcontainer.json b/.devcontainer.json
@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.194.3/containers/python-3
 {
 	"name": "Linux / Python 3.9",
-	"image": "ghcr.io/conda/conda-ci:master-linux-python3.9",
+	"image": "ghcr.io/conda/conda-ci:main-linux-python3.9",
 	"containerEnv": {
 		"RUNNING_ON_DEVCONTAINER": "1"
 	},

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -106,7 +106,7 @@ jobs:
           --rm -v ${PWD}:/opt/conda-src
           -e TEST_SPLITS
           -e TEST_GROUP
-          ghcr.io/conda/conda-ci:master-linux-python${{ matrix.python-version }}
+          ghcr.io/conda/conda-ci:main-linux-python${{ matrix.python-version }}
           /opt/conda-src/dev/linux/${{ matrix.test-type }}.sh
 
       - uses: codecov/codecov-action@v2

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,5 +1,4 @@
-# TODO: Replace gitpod with master
-image: ghcr.io/conda/conda-ci:gitpod-linux-python3.9
+image: ghcr.io/conda/conda-ci:main-linux-python3.9
 tasks:
   - name: initialize
     init: |
@@ -19,7 +18,7 @@ vscode:
 
 github:
   prebuilds:
-    # enable for master branch
+    # enable for default branch
     master: true
     # enable for other branches (defaults to false)
     branches: false