Skip to content

Commit f306854

Browse files
ssncferreirassncferreira
committed
Merge remote-tracking branch 'origin/main' into ssncferreira/exclude-schedule-settings-for-prebuilds
2 parents 73f5476 + 4980f18 commit f306854

36 files changed

+30
-32
lines changed

‎.github/workflows/ci.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -451,16 +451,21 @@ jobs:
451451
# Postgres tends not to choke.
452452
NUM_PARALLEL_PACKAGES=8
453453
NUM_PARALLEL_TESTS=16
454+
# Only the CLI and Agent are officially supported on Windows and the rest are too flaky
455+
PACKAGES="./cli/... ./enterprise/cli/... ./agent/..."
454456
elif [ "${{ runner.os }}" == "macOS" ]; then
455457
# Our macOS runners have 8 cores. We set NUM_PARALLEL_TESTS to 16
456458
# because the tests complete faster and Postgres doesn't choke. It seems
457459
# that macOS's tmpfs is faster than the one on Windows.
458460
NUM_PARALLEL_PACKAGES=8
459461
NUM_PARALLEL_TESTS=16
462+
# Only the CLI and Agent are officially supported on macOS and the rest are too flaky
463+
PACKAGES="./cli/... ./enterprise/cli/... ./agent/..."
460464
elif [ "${{ runner.os }}" == "Linux" ]; then
461465
# Our Linux runners have 8 cores.
462466
NUM_PARALLEL_PACKAGES=8
463467
NUM_PARALLEL_TESTS=8
468+
PACKAGES="./..."
464469
fi
465470
466471
# by default, run tests with cache
@@ -477,10 +482,7 @@ jobs:
477482
# invalidated. See scripts/normalize_path.sh for more details.
478483
normalize_path_with_symlinks "$RUNNER_TEMP/sym" "$(dirname $(which terraform))"
479484
480-
# We rerun failing tests to counteract flakiness coming from Postgres
481-
# choking on macOS and Windows sometimes.
482-
gotestsum --rerun-fails=2 --rerun-fails-max-failures=50 \
483-
--format standard-quiet --packages "./..." \
485+
gotestsum --format standard-quiet --packages "$PACKAGES" \
484486
-- -timeout=20m -v -p $NUM_PARALLEL_PACKAGES -parallel=$NUM_PARALLEL_TESTS $TESTCOUNT
485487
486488
- name: Upload Go Build Cache
@@ -550,7 +552,6 @@ jobs:
550552
env:
551553
POSTGRES_VERSION: "17"
552554
TS_DEBUG_DISCO: "true"
553-
TEST_RETRIES: 2
554555
run: |
555556
make test-postgres
556557
@@ -604,7 +605,7 @@ jobs:
604605
POSTGRES_VERSION: "17"
605606
run: |
606607
make test-postgres-docker
607-
gotestsum --junitfile="gotests.xml" --packages="./..." --rerun-fails=2 --rerun-fails-abort-on-data-race -- -race -parallel 4 -p 4
608+
gotestsum --junitfile="gotests.xml" --packages="./..." -- -race -parallel 4 -p 4
608609
609610
- name: Upload Test Cache
610611
uses: ./.github/actions/test-cache/upload
@@ -726,7 +727,6 @@ jobs:
726727
if: ${{ !matrix.variant.premium }}
727728
env:
728729
DEBUG: pw:api
729-
CODER_E2E_TEST_RETRIES: 2
730730
working-directory: site
731731

732732
# Run all of the tests with a premium license
@@ -736,7 +736,6 @@ jobs:
736736
DEBUG: pw:api
737737
CODER_E2E_LICENSE: ${{ secrets.CODER_E2E_LICENSE }}
738738
CODER_E2E_REQUIRE_PREMIUM_TESTS: "1"
739-
CODER_E2E_TEST_RETRIES: 2
740739
working-directory: site
741740

742741
- name: Upload Playwright Failed Tests
@@ -1406,7 +1405,7 @@ jobs:
14061405
uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
14071406

14081407
- name: Set up Flux CLI
1409-
uses: fluxcd/flux2/action@bda4c8187e436462be0d072e728b67afa215c593 # v2.6.3
1408+
uses: fluxcd/flux2/action@6bf37f6a560fd84982d67f853162e4b3c2235edb # v2.6.4
14101409
with:
14111410
# Keep this and the github action up to date with the version of flux installed in dogfood cluster
14121411
version: "2.5.1"

‎.github/workflows/docs-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup Node
2929
uses: ./.github/actions/setup-node
3030

31-
- uses: tj-actions/changed-files@cf79a64fed8a943fb1073260883d08fe0dfb4e56 # v45.0.7
31+
- uses: tj-actions/changed-files@055970845dd036d7345da7399b7e89f2e10f2b04 # v45.0.7
3232
id: changed-files
3333
with:
3434
files: |

‎.github/workflows/start-workspace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
timeout-minutes: 5
2020
steps:
2121
- name: Start Coder workspace
22-
uses: coder/start-workspace-action@35a4608cefc7e8cc56573cae7c3b85304575cb72
22+
uses: coder/start-workspace-action@f97a681b4cc7985c9eef9963750c7cc6ebc93a19
2323
with:
2424
github-token: ${{ secrets.GITHUB_TOKEN }}
2525
github-username: >-

‎docs/about/screenshots.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
## Log in
44

5-
![Install Coder in your cloud or air-gapped on-premises. Developers simply log in via their browser to access their Workspaces.](../images/screenshots/login.png)
5+
![Install Coder in your cloud or air-gapped on-premises. Developers simply log in via their browser to access their Workspaces.](../images/screenshots/coder-login.png)
66

77
Install Coder in your cloud or air-gapped on-premises. Developers simply log in
88
via their browser to access their Workspaces.
99

1010
## Templates
1111

12-
![Developers provision their own ephemeral Workspaces in minutes using pre-defined Templates that include approved tooling and infrastructure.](../images/screenshots/templates_listing.png)
12+
![Developers provision their own ephemeral Workspaces in minutes using pre-defined Templates that include approved tooling and infrastructure.](../images/screenshots/templates-listing.png)
1313

1414
Developers provision their own ephemeral Workspaces in minutes using pre-defined
1515
Templates that include approved tooling and infrastructure.
1616

17-
![Template administrators can either create a new Template from scratch or choose a Starter Template](../images/screenshots/starter_templates.png)
17+
![Template administrators can either create a new Template from scratch or choose a Starter Template](../images/screenshots/starter-templates.png)
1818

1919
Template administrators can either create a new Template from scratch or choose
2020
a Starter Template.
@@ -26,25 +26,25 @@ underlying infrastructure that Coder Workspaces run on.
2626

2727
## Workspaces
2828

29-
![Developers create and delete their own workspaces. Coder administrators can easily enforce Workspace scheduling and autostop policies to ensure idle Workspaces don’t burn unnecessary cloud budget.](../images/screenshots/workspaces_listing.png)
29+
![Developers create and delete their own workspaces. Coder administrators can easily enforce Workspace scheduling and autostop policies to ensure idle Workspaces don’t burn unnecessary cloud budget.](../images/screenshots/workspaces-listing.png)
3030

3131
Developers create and delete their own workspaces. Coder administrators can
3232
easily enforce Workspace scheduling and autostop policies to ensure idle
3333
Workspaces don’t burn unnecessary cloud budget.
3434

35-
![Developers launch their favorite web-based or desktop IDE, browse files, or access their Workspace’s Terminal.](../images/screenshots/workspace_launch.png)
35+
![Developers launch their favorite web-based or desktop IDE, browse files, or access their Workspace’s Terminal.](../images/screenshots/workspace-running-with-topbar.png)
3636

3737
Developers launch their favorite web-based or desktop IDE, browse files, or
3838
access their Workspace’s Terminal.
3939

4040
## Administration
4141

42-
![Coder administrators can access Template usage insights to understand which Templates are most popular and how well they perform for developers.](../images/screenshots/templates_insights.png)
42+
![Coder administrators can access Template usage insights to understand which Templates are most popular and how well they perform for developers.](../images/screenshots/template-insights.png)
4343

4444
Coder administrators can access Template usage insights to understand which
4545
Templates are most popular and how well they perform for developers.
4646

47-
![Coder administrators can control *every* aspect of their Coder deployment.](../images/screenshots/settings.png)
47+
![Coder administrators can control *every* aspect of their Coder deployment.](../images/screenshots/admin-settings.png)
4848

4949
Coder administrators can control *every* aspect of their Coder deployment.
5050

‎docs/admin/templates/extending-templates/parameters.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ data "coder_parameter" "dotfiles_url" {
207207
Immutable parameters can only be set in these situations:
208208
209209
- Creating a workspace for the first time.
210-
- Updating a workspace to a new template version. This sets the initial value
211-
for required parameters.
210+
- Updating a workspace to a new template version.
211+
This sets the initial value for required parameters.
212212
213213
The idea is to prevent users from modifying fragile or persistent workspace
214214
resources like volumes, regions, and so on.
@@ -224,9 +224,8 @@ data "coder_parameter" "region" {
224224
}
225225
```
226226
227-
You can modify a parameter's `mutable` attribute state anytime. In case of
228-
emergency, you can temporarily allow for changing immutable parameters to fix an
229-
operational issue, but it is not advised to overuse this opportunity.
227+
If a required parameter is empty or if the workspace creation page detects an incompatibility between selected
228+
parameters, the **Create workspace** button is disabled until the issues are resolved.
230229
231230
## Ephemeral parameters
232231

‎docs/images/platforms/docker/create-workspace.png

-334 KB
Binary file not shown.

‎docs/images/platforms/docker/ides.png

-119 KB
Binary file not shown.

‎docs/images/platforms/docker/login.png

-166 KB
Binary file not shown.

‎docs/images/platforms/kubernetes/region-picker.png

-29.8 KB
Binary file not shown.

‎docs/images/platforms/kubernetes/starter-template.png

-44.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)