Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade available actions to v3 #593

Merged
merged 4 commits into from Nov 22, 2022
Merged

Upgrade available actions to v3 #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e238754
Upgrade available actions to v3
brandonc Nov 21, 2022
9f3caec
Don't run on pull_request_target event
brandonc Nov 21, 2022
35ff22d
Allow plan export queued status
brandonc Nov 21, 2022
65fe9e4
Remove test dependency on order of workspace ids
brandonc Nov 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ jobs:
timeout-minutes: 5
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v3
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v3
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/create-jira-issue.yml
View file
Open in desktop
Expand Up @@ -3,8 +3,6 @@ name: Create Jira Issue
on:
issues:
types: [opened, closed, deleted, reopened]
pull_request_target:
types: [opened, closed, reopened]
issue_comment:
types: [created]

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/golangci-lint.yml
View file
Open in desktop
Expand Up @@ -8,13 +8,13 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set local Go version
run: |
VERSION=`cat .go-version| awk '{printf$1}'`
echo "go_version=$VERSION" >> $GITHUB_ENV
echo "go_version=$VERSION" >> $GITHUB_ENV
- name: Setup Go Environment
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: "${{ env.go_version }}"
- name: golangci-lint
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly-tfe-ci.yml
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v3
Expand All @@ -34,7 +34,7 @@ jobs:
timeout-minutes: 5
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v3
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v3
Expand Down
6 changes: 3 additions & 3 deletions helper_test.go
View file
Open in desktop
Expand Up @@ -1164,7 +1164,7 @@ func createPlanExport(t *testing.T, client *Client, r *Run) (*PlanExport, func()
t.Fatal(err)
}

timeout := 3 * time.Minute
timeout := 10 * time.Minute

ctxPollExportReady, cancelPollExportReady := context.WithTimeout(ctx, timeout)
t.Cleanup(cancelPollExportReady)
Expand All @@ -1184,7 +1184,7 @@ func createPlanExport(t *testing.T, client *Client, r *Run) (*PlanExport, func()
t.Fatal(err)
}

if pe.Status == PlanExportFinished {
if pe.Status == PlanExportFinished || pe.Status == PlanExportQueued {
return pe, func() {
if rCleanup != nil {
rCleanup()
Expand All @@ -1193,7 +1193,7 @@ func createPlanExport(t *testing.T, client *Client, r *Run) (*PlanExport, func()
} else if pe.Status == PlanExportErrored {
t.Fatal("Plan export failed")
} else {
t.Logf("Waiting for plan export finished but was %s", pe.Status)
t.Logf("Waiting for plan export finished or queued but was %s", pe.Status)
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions variable_set_test.go
View file
Open in desktop
Expand Up @@ -288,8 +288,10 @@ func TestVariableSetsApplyToAndRemoveFromWorkspaces(t *testing.T) {

// Variable set should be applied to [wTest1, wTest2]
assert.Equal(t, 2, len(vsAfter.Workspaces))
assert.Equal(t, wTest1.ID, vsAfter.Workspaces[0].ID)
assert.Equal(t, wTest2.ID, vsAfter.Workspaces[1].ID)
wsIDs := []string{vsAfter.Workspaces[0].ID, vsAfter.Workspaces[1].ID}

assert.Contains(t, wsIDs, wTest1.ID)
assert.Contains(t, wsIDs, wTest2.ID)
})

t.Run("with first workspace removed", func(t *testing.T) {
Expand Down