This reverts commit f18bc5262f.
This commit is contained in:
1 parent
f18bc5262f
commit
31ca969f4f
3 files changed
+43
-1
No files matched your search
@@ -27,6 +27,11 @@ env:
|
||||
|
||||
jobs:
|
||||
setup:
|
||||
outputs:
|
||||
cache-go-build: ${{ steps.go-cache-paths.outputs.go-build }}
|
||||
cache-go-mod: ${{ steps.go-cache-paths.outputs.go-mod }}
|
||||
cache-go-bin: ${{ steps.go-cache-paths.outputs.go-bin }}
|
||||
go-cache-key: ${{ steps.go-cache-key.outputs.key }}
|
||||
runs-on: ${{ fromJSON(vars.RUNNER) }}
|
||||
steps:
|
||||
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
|
||||
@@ -37,6 +42,30 @@ jobs:
|
||||
with:
|
||||
go-version: ${{ inputs.go-version }}
|
||||
cache: false
|
||||
- name: Determine go cache key
|
||||
id: go-cache-key
|
||||
run: |
|
||||
echo "key=${{ runner.os }}-go-${{ hashFiles('**/go.sum', './Makefile', './tools/tools.go') }}" >> "$GITHUB_OUTPUT"
|
||||
- name: Determine Go cache paths
|
||||
id: go-cache-paths
|
||||
run: |
|
||||
echo "go-build=$(go env GOCACHE)" >> "$GITHUB_OUTPUT"
|
||||
echo "go-mod=$(go env GOMODCACHE)" >> "$GITHUB_OUTPUT"
|
||||
echo "go-bin=$(go env GOPATH)/bin" >> "$GITHUB_OUTPUT"
|
||||
- name: Set up Go modules cache
|
||||
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
|
||||
with:
|
||||
path: |
|
||||
${{ steps.go-cache-paths.outputs.go-build }}
|
||||
${{ steps.go-cache-paths.outputs.go-mod }}
|
||||
${{ steps.go-cache-paths.outputs.go-bin }}
|
||||
key: ${{ steps.go-cache-key.outputs.key }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-go
|
||||
- name: Install Tools
|
||||
run: |
|
||||
go mod download
|
||||
make tools
|
||||
enos:
|
||||
name: Integration
|
||||
needs:
|
||||
@@ -81,6 +110,17 @@ jobs:
|
||||
with:
|
||||
go-version: ${{ inputs.go-version }}
|
||||
cache: false
|
||||
- name: Set up Go modules cache
|
||||
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
|
||||
with:
|
||||
path: |
|
||||
${{ needs.setup.outputs.cache-go-build }}
|
||||
${{ needs.setup.outputs.cache-go-mod }}
|
||||
${{ needs.setup.outputs.cache-go-bin }}
|
||||
key: ${{ needs.setup.outputs.go-cache-key }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-go
|
||||
fail-on-cache-miss: true
|
||||
- name: Set up Terraform
|
||||
uses: hashicorp/setup-terraform@a1502cd9e758c50496cc9ac5308c4843bcd56d36 # TSCCR: loading action configs: failed to query HEAD reference: failed to get advertised references: authorization failed
|
||||
with:
|
||||
|
||||
@@ -192,7 +192,7 @@ resource "enos_local_exec" "run_e2e_test" {
|
||||
}
|
||||
|
||||
inline = var.debug_no_run ? [""] : [
|
||||
"set -o pipefail; PATH=\"${var.local_boundary_dir}:$PATH\" go test -v ${var.test_package} -count=1 -json -timeout ${var.test_timeout} | tee ${path.module}/../../test-e2e-${local.package_name}.log"
|
||||
"set -o pipefail; PATH=\"${var.local_boundary_dir}:$PATH\" go test -v ${var.test_package} -count=1 -json -timeout ${var.test_timeout}| tparse -follow -format plain 2>&1 | tee ${path.module}/../../test-e2e-${local.package_name}.log"
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -49,6 +49,8 @@ docker run \
|
||||
-e "E2E_MAX_PAGE_SIZE=$E2E_MAX_PAGE_SIZE" \
|
||||
--mount type=bind,src=$BOUNDARY_DIR,dst=/src/boundary/ \
|
||||
--mount type=bind,src=$MODULE_DIR/../..,dst=/testlogs \
|
||||
--mount type=bind,src=$(go env GOCACHE),dst=/root/.cache/go-build \
|
||||
--mount type=bind,src=$(go env GOMODCACHE),dst=/go/pkg/mod \
|
||||
-v "$MODULE_DIR/test.sh:/scripts/test.sh" \
|
||||
-v "$E2E_SSH_KEY_PATH:/keys/target.pem" \
|
||||
-v "$BOUNDARY_CLI_DIR:/boundary.zip" \
|
||||
|
||||
Reference in new issue
Block a user