From de288d7cc422e5d6fe7814a36f7a673c1f1a8ea9 Mon Sep 17 00:00:00 2001 From: randymcmillan Date: Fri, 5 May 2023 14:52:05 -0400 Subject: [PATCH] make: act-automate: act-docker-shell --- .github/workflows/automate.yml | 5 +++-- .github/workflows/docker.shell.yml | 10 ++++------ GNUmakefile | 1 + act.mk | 4 ++++ 4 files changed, 12 insertions(+), 8 deletions(-) create mode 100755 act.mk diff --git a/.github/workflows/automate.yml b/.github/workflows/automate.yml index 8659270..4676de2 100644 --- a/.github/workflows/automate.yml +++ b/.github/workflows/automate.yml @@ -19,14 +19,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: styfle/cancel-workflow-action@0.9.1 + if: ${{ !env.ACT }} with: access_token: ${{ github.token }} - uses: actions/checkout@v2 - name: make alpine-build run: | - make alpine-build + make - uses: actions/checkout@v2 - name: make ubuntu-build run: | - make ubuntu-build + make diff --git a/.github/workflows/docker.shell.yml b/.github/workflows/docker.shell.yml index 6eae0cf..53391a2 100644 --- a/.github/workflows/docker.shell.yml +++ b/.github/workflows/docker.shell.yml @@ -29,28 +29,26 @@ jobs: steps: ## REF: https://githubmemory.com/repo/Gisleburt/cancel-workflow-action - uses: styfle/cancel-workflow-action@0.8.0 + if: ${{ !env.ACT }} with: access_token: ${{ github.token }} - uses: actions/checkout@v2 - name: Make run: | - make alpine-build - make shell - #make build-debian + make ulatest-host: runs-on: ubuntu-latest steps: ## REF: https://githubmemory.com/repo/Gisleburt/cancel-workflow-action - uses: styfle/cancel-workflow-action@0.8.0 + if: ${{ !env.ACT }} with: access_token: ${{ github.token }} - uses: actions/checkout@v2 - name: Make run: | - make alpine-build - make shell - #make build-debian + make diff --git a/GNUmakefile b/GNUmakefile index 6ccf9c8..a298af9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -385,3 +385,4 @@ clean: && echo 'Image(s) for "$(PROJECT_NAME):$(HOST_USER)" removed.' \ || echo 'Image(s) for "$(PROJECT_NAME):$(HOST_USER)" already removed.' +-include act.mk diff --git a/act.mk b/act.mk new file mode 100755 index 0000000..db72ea6 --- /dev/null +++ b/act.mk @@ -0,0 +1,4 @@ +act-automate-alpine:docker-start## run act in .github + @export $(cat ~/GH_TOKEN.txt) && act -vbr -W .github/workflows/automate.yml +act-docker-shell:docker-start## run act in .github + @export $(cat ~/GH_TOKEN.txt) && act -vbr -W .github/workflows/docker.shell.yml \ No newline at end of file