Skip to content

Commit df6fdbe

Browse files
authored
Merge pull request #37485 from hashicorp/PSS-139-gh-runner-labels-cleanup
Use single custom label in GHA jobs
2 parents 634f7d1 + 10d97fb commit df6fdbe

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

.github/actionlint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
self-hosted-runner:
22
# Labels of self-hosted runner in array of string
3-
labels: [custom, small, medium, large, xl, custom-linux-medium]
3+
labels: [custom-linux-xl, custom-linux-small, custom-linux-medium, custom-linux-large, custom-linux-xl]

.github/workflows/acctest-terraform-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
3838
tflint:
3939
name: Validate Acceptance Tests
40-
runs-on: [custom, linux, xl]
40+
runs-on: custom-linux-xl
4141
strategy:
4242
matrix:
4343
path: ['[a-f]', '[g-z]']

.github/workflows/examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
exit $exit_code
6060
6161
validate-terraform:
62-
runs-on: [custom, linux, large]
62+
runs-on: custom-linux-large
6363
strategy:
6464
fail-fast: false
6565
matrix:

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
golangci-linta:
2121
name: 1 of 2
22-
runs-on: [custom, linux, large]
22+
runs-on: custom-linux-large
2323
steps:
2424
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
2525
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
@@ -42,7 +42,7 @@ jobs:
4242
golangci-lintb:
4343
name: 2 of 2
4444
needs: [golangci-linta]
45-
runs-on: [custom, linux, xl]
45+
runs-on: custom-linux-xl
4646
steps:
4747
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
4848
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1

.github/workflows/goreleaser-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
build-32-bit:
5656
# Run a single compiler check for 32-bit architecture (FreeBSD/ARM)
5757
# Ref: https://github.com/hashicorp/terraform-provider-aws/issues/8988
58-
runs-on: [custom, linux, small]
58+
runs-on: custom-linux-small
5959
steps:
6060
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
6161
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1

.github/workflows/provider.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
go_build:
4949
name: go build
5050
needs: [go_mod_download]
51-
runs-on: [custom, linux, medium]
51+
runs-on: custom-linux-medium
5252
steps:
5353
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
5454
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
@@ -116,7 +116,7 @@ jobs:
116116
go_test:
117117
name: go test
118118
needs: [go_build]
119-
runs-on: [custom, linux, xl]
119+
runs-on: custom-linux-xl
120120
steps:
121121
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
122122
with:
@@ -176,7 +176,7 @@ jobs:
176176
validate_sweepers_unlinked:
177177
name: Sweeper Functions Not Linked
178178
needs: [go_build]
179-
runs-on: [custom, linux, medium]
179+
runs-on: custom-linux-medium
180180
steps:
181181
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
182182
with:

.github/workflows/providerlint.yml

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

1616
jobs:
1717
providerlint:
18-
runs-on: [custom, linux, medium]
18+
runs-on: custom-linux-medium
1919
steps:
2020
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
2121
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
- run: terrafmt diff ./website --check --pattern '*.markdown'
111111

112112
tflint:
113-
runs-on: [custom, linux, xl]
113+
runs-on: custom-linux-xl
114114
steps:
115115
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
116116
with:

0 commit comments

Comments
 (0)