From a05413f9b60771ec3c387136747aaa22e5f3c6d0 Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Mon, 13 Sep 2021 16:47:34 -0400 Subject: [PATCH] create GHA env for mod testing, update secrets Signed-off-by: Tony Worm --- .github/workflows/test_mod.cue | 3 +++ .github/workflows/test_mod.yml | 3 +++ Makefile | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_mod.cue b/.github/workflows/test_mod.cue index 1b8d55654..404275d97 100644 --- a/.github/workflows/test_mod.cue +++ b/.github/workflows/test_mod.cue @@ -6,14 +6,17 @@ common.#Workflow & { name: "test_mod" on: pull_request: { paths: ["lib/mod/**"] } jobs: test: { + environment: "hof mod testing" steps: [ for step in common.#BuildSteps {step} ] + [{ name: "Run mod tests" run: """ hof test test.cue -s lib -t test -t mod """ env: { + HOFMOD_SSHKEY: "${{secrets.HOFMOD_SSHKEY}}" GITHUB_TOKEN: "${{secrets.HOFMOD_TOKEN}}" GITLAB_TOKEN: "${{secrets.GITLAB_TOKEN}}" + BITBUCKET_TOKEN: "${{secrets.BITBUCKET_TOKEN}}" } }] } diff --git a/.github/workflows/test_mod.yml b/.github/workflows/test_mod.yml index 927ffbfb3..72327bf82 100644 --- a/.github/workflows/test_mod.yml +++ b/.github/workflows/test_mod.yml @@ -15,6 +15,7 @@ jobs: - macos-latest fail-fast: false runs-on: ${{ matrix.os }} + environment: hof mod testing steps: - name: Install Go uses: actions/setup-go@v2 @@ -29,5 +30,7 @@ jobs: - name: Run mod tests run: hof test test.cue -s lib -t test -t mod env: + HOFMOD_SSHKEY: ${{secrets.HOFMOD_SSHKEY}} GITHUB_TOKEN: ${{secrets.HOFMOD_TOKEN}} GITLAB_TOKEN: ${{secrets.GITLAB_TOKEN}} + BITBUCKET_TOKEN: ${{secrets.BITBUCKET_TOKEN}} diff --git a/Makefile b/Makefile index bef2d1ac2..1be9dfe12 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,7 @@ clocdev: hof.cue design schema lang lib docs test cue.mods go.mod cloc --read-lang-def=$$HOME/hof/jumpfiles/assets/cloc_defs.txt --exclude-dir=cue.mod,vendor $^ WORKFLOWS = default \ - test_mod \ - windows + test_mod .PHONY: workflow workflows = $(addprefix workflow_, $(WORKFLOWS))