Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 22631ab

Browse files
authoredOct 3, 2024··
Merge branch 'main' into bcpeinhardt/workspaces-filter
2 parents 5cae52a + 39faf50 commit 22631ab

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed
 

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- windows-latest
2424
runs-on: ${{ matrix.platform }}
2525
steps:
26-
- uses: actions/checkout@v4.1.7
26+
- uses: actions/checkout@v4.2.0
2727

2828
- uses: actions/setup-java@v4
2929
with:
@@ -56,7 +56,7 @@ jobs:
5656
steps:
5757
# Check out current repository
5858
- name: Fetch Sources
59-
uses: actions/checkout@v4.1.7
59+
uses: actions/checkout@v4.2.0
6060

6161
# Setup Java 11 environment for the next steps
6262
- name: Setup Java
@@ -140,7 +140,7 @@ jobs:
140140

141141
# Check out current repository
142142
- name: Fetch Sources
143-
uses: actions/checkout@v4.1.7
143+
uses: actions/checkout@v4.2.0
144144

145145
# Remove old release drafts by using the curl request for the available releases with draft flag
146146
- name: Remove Old Release Drafts

‎.github/workflows/release.yml

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

1616
# Check out current repository
1717
- name: Fetch Sources
18-
uses: actions/checkout@v4.1.7
18+
uses: actions/checkout@v4.2.0
1919
with:
2020
ref: ${{ github.event.release.tag_name }}
2121

‎src/main/kotlin/com/coder/gateway/sdk/CoderRestClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ open class CoderRestClient(
175175
// It is possible for there to be resources with duplicate names so we
176176
// need to use a set.
177177
return workspaces.flatMap { ws ->
178-
resources(ws).filter { it.agents != null }.flatMap { it.agents!! }.map {
178+
ws.latestBuild.resources.ifEmpty { resources(ws) }.filter { it.agents != null }.flatMap { it.agents!! }.map {
179179
ws to it
180180
}
181181
}.toSet()

‎src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
244244
foreground = Color.GRAY
245245
}
246246
}
247-
label("").resizableColumn().align(AlignX.FILL)
247+
label(workspaceProjectIDE.name.replace(workspaceName+".","")).resizableColumn()
248248
label(workspaceProjectIDE.ideName).applyToComponent {
249249
foreground = JBUI.CurrentTheme.ContextHelp.FOREGROUND
250250
font = ComponentPanelBuilder.getCommentFont(font)

0 commit comments

Comments
 (0)
Please sign in to comment.