diff --git a/.github/actions/pull_docker_image/action.yml b/.github/actions/pull_docker_image/action.yml index 5f4277dc0765d..9618615b02cf9 100644 --- a/.github/actions/pull_docker_image/action.yml +++ b/.github/actions/pull_docker_image/action.yml @@ -1,24 +1,26 @@ -name: Pull docker image from ghcr -description: Pull docker image from ghcr - -inputs: - image: - description: The docker image to pull - required: true - default: kmake-image:latest - - github_token: - description: The GitHub token to use for authentication - required: true - -runs: - using: "composite" - steps: - - name: Clone kmake-image - run: | - git clone https://github.com/qualcomm-linux/kmake-image.git - - - name: Build docker image - run: | - cd kmake-image - docker build . -t kmake-image +name: Pull docker image +description: Pull docker image + +inputs: + image: + description: The docker image to pull + required: true + default: kmake-image:latest + + github_token: + description: The GitHub token to use for authentication + required: true + +runs: + using: "composite" + steps: + - name: Clone kmake-image + shell: bash + run: | + git clone https://github.com/qualcomm-linux/kmake-image.git + + - name: Build docker image + shell: bash + run: | + cd kmake-image + docker build . -t kmake-image diff --git a/.github/workflows/pre_merge.yml b/.github/workflows/pre_merge.yml index 906ebb42c80b1..0bca8e714311f 100644 --- a/.github/workflows/pre_merge.yml +++ b/.github/workflows/pre_merge.yml @@ -1,22 +1,19 @@ -name: pre_merge -on: - pull_request_target: - branches: - - qcom-next-staging - pull_request: - branches: - - qcom-next-staging - -jobs: - build: - uses: ./.github/workflows/build.yml - secrets: inherit - with: - docker_image: kmake-image:latest - - test: - needs: [build] - uses: ./.github/workflows/test.yml - secrets: inherit - with: - docker_image: kmake-image:latest \ No newline at end of file +name: pre_merge +on: + pull_request_target: + branches: + - qcom-next-staging + +jobs: + build: + uses: ./.github/workflows/build.yml + secrets: inherit + with: + docker_image: kmake-image:latest + + test: + needs: [build] + uses: ./.github/workflows/test.yml + secrets: inherit + with: + docker_image: kmake-image:latest