diff --git a/.github/workflows/clj-build-dedicated.yml b/.github/workflows/clj-build-dedicated.yml index d663674..ab541d1 100644 --- a/.github/workflows/clj-build-dedicated.yml +++ b/.github/workflows/clj-build-dedicated.yml @@ -2,10 +2,10 @@ name: Clojure Build on: workflow_call: inputs: - runner: + runner_group: required: false type: string - default: self-hosted + default: build target_branch: required: false type: string @@ -14,7 +14,7 @@ jobs: build: name: Build App runs-on: - group: "build" + group: ${{ inputs.runner_group }} concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/clj-build-lib.yml b/.github/workflows/clj-build-lib.yml index 24b8c6c..d8d54cd 100644 --- a/.github/workflows/clj-build-lib.yml +++ b/.github/workflows/clj-build-lib.yml @@ -2,10 +2,10 @@ name: Clojure Build Library on: workflow_call: inputs: - runner: + runner_group: required: false type: string - default: self-hosted + default: build target_branch: required: false type: string @@ -17,7 +17,8 @@ on: jobs: build: name: Build Library - runs-on: ${{ inputs.runner }} + runs-on: + group: ${{ inputs.runner_group }} concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/clj-build-test-img.yml b/.github/workflows/clj-build-test-img.yml index ba13c71..abff0ba 100644 --- a/.github/workflows/clj-build-test-img.yml +++ b/.github/workflows/clj-build-test-img.yml @@ -2,17 +2,18 @@ name: Clojure Build and Push Test Image on: workflow_call: inputs: - runner: + runner_group: required: false type: string - default: self-hosted + default: build test_file_path: required: true type: string jobs: test-image: name: Build and Push Test Image - runs-on: ${{ inputs.runner }} + runs-on: + group: ${{ inputs.runner_group }} steps: - name: check out most recent commit uses: actions/checkout@v4 @@ -64,4 +65,4 @@ jobs: if [[ ${{ contains(github.ref, 'master') }} = true ]]; then docker tag ${{ steps.vars.outputs.image }}_tests:${{ steps.vars.outputs.branch_tag }} ${{ steps.vars.outputs.image }}_tests:latest docker push ${{ steps.vars.outputs.image }}_tests:latest - fi \ No newline at end of file + fi diff --git a/.github/workflows/clj-build.yml b/.github/workflows/clj-build.yml index 42a7461..ab541d1 100644 --- a/.github/workflows/clj-build.yml +++ b/.github/workflows/clj-build.yml @@ -2,10 +2,10 @@ name: Clojure Build on: workflow_call: inputs: - runner: + runner_group: required: false type: string - default: self-hosted + default: build target_branch: required: false type: string @@ -13,7 +13,8 @@ on: jobs: build: name: Build App - runs-on: ${{ inputs.runner }} + runs-on: + group: ${{ inputs.runner_group }} concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -128,4 +129,4 @@ jobs: name: Release ${{ steps.vars.outputs.version }} body: 'Docker Image: [${{ steps.vars.outputs.image }}:${{ steps.vars.outputs.version }}](https://github.com/orgs/rentpath/packages/container/package/${{ steps.vars.outputs.rawrepo }})' draft: false - prerelease: false \ No newline at end of file + prerelease: false diff --git a/.github/workflows/clj-vuln-scan.yml b/.github/workflows/clj-vuln-scan.yml index 1d0389a..3be8435 100644 --- a/.github/workflows/clj-vuln-scan.yml +++ b/.github/workflows/clj-vuln-scan.yml @@ -2,10 +2,10 @@ name: Clojure Vulnerability Scan on: workflow_call: inputs: - runner: + runner_group: required: false type: string - default: self-hosted + default: build target_branch: required: false type: string @@ -17,7 +17,8 @@ on: jobs: scan: name: Scan Dependencies - runs-on: ${{ inputs.runner }} + runs-on: + group: ${{ inputs.runner_group }} concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true