Skip to content

Commit 5f55083

Browse files
committed
use oidc
1 parent fba07cd commit 5f55083

File tree

3 files changed

+19
-59
lines changed

3 files changed

+19
-59
lines changed

.github/workflows/acc-test.yaml

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,22 @@ on:
1111
- '**/go.mod'
1212

1313
jobs:
14-
acc-tests:
15-
runs-on: [self-hosted, 1ES.Pool=terraform-azurerm-compute]
16-
environment:
17-
name: acctests
14+
check:
15+
runs-on: ubuntu-latest
1816
steps:
19-
- uses: actions/checkout@v3
20-
- name: init
17+
- name: Checking for Fork
18+
shell: pwsh
2119
run: |
22-
docker run --rm -v $(pwd):/src -w /src mcr.microsoft.com/azterraform:latest make generate
23-
- name: e2e test
24-
run: |
25-
sh scripts/ci-e2e.sh
26-
- name: upload test version snapshots
27-
uses: actions/upload-artifact@v3
28-
with:
29-
name: TestRecord-${{ github.event.number }}
30-
retention-days: 60
31-
path: |
32-
examples/**/TestRecord.md.tmp
33-
- name: version-upgrade test
34-
env:
35-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36-
run: |
37-
sh scripts/ci-version-upgrade.sh
20+
$isFork = "${{ github.event.pull_request.head.repo.fork }}"
21+
if($isFork -eq "true") {
22+
echo "### WARNING: This workflow is disabled for forked repositories. Please follow the [release branch process](https://azure.github.io/Azure-Verified-Modules/contributing/terraform/terraform-contribution-flow/#5-create-a-pull-request-to-the-upstream-repository) if end to end tests are required." >> $env:GITHUB_STEP_SUMMARY
23+
}
24+
25+
run-e2e-tests:
26+
if: github.event.pull_request.head.repo.fork == false
27+
uses: Azure/tfmod-scaffold/.github/workflows/tfvm_e2e.yaml@main
28+
name: end to end
29+
secrets: inherit
30+
permissions:
31+
id-token: write
32+
contents: read

.github/workflows/weekly-e2e.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.

GNUmakefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
SHELL := /bin/bash
22

3-
-include $(shell curl -sSL "https://raw.githubusercontent.com/Azure/tfmod-scaffold/main/scripts/install.sh" | bash -s > /dev/null ; echo tfmod-scaffold/GNUmakefile)
4-
5-
init:
6-
@sh "$(CURDIR)/scripts/init.sh"
7-
8-
cleanup:
9-
@sh "$(CURDIR)/scripts/cleanup.sh"
3+
$(shell curl -H 'Cache-Control: no-cache, no-store' -sSL "https://raw.githubusercontent.com/Azure/tfmod-scaffold/refs/heads/main/GNUmakefile" -o tfvmmakefile)
4+
-include tfvmmakefile

0 commit comments

Comments
 (0)