Skip to content

Commit e49f416

Browse files
authored
chore: merge codeql checks to run in parallel (#5907)
* chore: merge codeql checks to run in parallel This reduces a check and should maintain ~the same CI time. * fix: close reconnecting pty conn when exiting agent Fixes https://github.com/coder/coder/actions/runs/4038282899/jobs/6942170850 * Fix closing when agent fails * Fix conpty * Fix contrib * Skip runner tests for being flakes * Fix gpg key test * Fix golden files * Fix comments * Fix closed * Fix capitalized title * Add a timeout when checking for dead links
1 parent 8487127 commit e49f416

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

.github/workflows/ci.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ jobs:
9696
- if: github.ref == 'refs/heads/main' && !github.event.pull_request.head.repo.fork
9797
uses: gaurav-nelson/github-action-markdown-link-check@v1
9898
name: Check for dead links (main)
99+
timeout-minutes: 1
99100
with:
100101
use-quiet-mode: yes
101102
use-verbose-mode: yes
@@ -104,6 +105,7 @@ jobs:
104105
- if: github.ref != 'refs/heads/main' || github.event.pull_request.head.repo.fork
105106
uses: gaurav-nelson/github-action-markdown-link-check@v1
106107
name: Check for dead links (pull request)
108+
timeout-minutes: 1
107109
with:
108110
use-quiet-mode: yes
109111
use-verbose-mode: yes

.github/workflows/contrib.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
requireScope: false
6060

6161
release-labels:
62-
name: Release labels
6362
runs-on: ubuntu-latest
6463
# Depend on lint so that title is Conventional Commits-compatible.
6564
needs: [title]

.github/workflows/security.yaml

+2-14
Original file line numberDiff line numberDiff line change
@@ -27,49 +27,37 @@ concurrency:
2727
jobs:
2828
codeql:
2929
runs-on: ${{ github.repository_owner == 'coder' && 'ubuntu-latest-16-cores' || 'ubuntu-latest' }}
30-
strategy:
31-
fail-fast: false
32-
matrix:
33-
language: ["go", "javascript"]
34-
3530
steps:
36-
- name: Checkout repository
37-
uses: actions/checkout@v3
31+
- uses: actions/checkout@v3
3832

3933
- name: Initialize CodeQL
4034
uses: github/codeql-action/init@v2
4135
with:
42-
languages: ${{ matrix.language }}
36+
languages: go, javascript
4337

4438
- name: Setup Go
45-
if: matrix.language == 'go'
4639
uses: actions/setup-go@v3
4740
with:
4841
go-version: "~1.19"
4942

5043
- name: Go Cache Paths
51-
if: matrix.language == 'go'
5244
id: go-cache-paths
5345
run: |
5446
echo "GOMODCACHE=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
5547
5648
- name: Go Mod Cache
57-
if: matrix.language == 'go'
5849
uses: actions/cache@v3
5950
with:
6051
path: ${{ steps.go-cache-paths.outputs.GOMODCACHE }}
6152
key: ${{ runner.os }}-release-go-mod-${{ hashFiles('**/go.sum') }}
6253

6354
# Workaround to prevent CodeQL from building the dashboard.
6455
- name: Remove Makefile
65-
if: matrix.language == 'go'
6656
run: |
6757
rm Makefile
6858
6959
- name: Perform CodeQL Analysis
7060
uses: github/codeql-action/analyze@v2
71-
with:
72-
category: "/language:${{matrix.language}}"
7361

7462
trivy:
7563
runs-on: ${{ github.repository_owner == 'coder' && 'ubuntu-latest-16-cores' || 'ubuntu-latest' }}

0 commit comments

Comments
 (0)