diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2019-12-17 13:49:24 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2019-12-17 13:52:32 +0300 |
| commit | 208ab6421f76fdb5f98d5e3b256b9ead4ab92fbf (patch) | |
| tree | 36956020aa2ab4b6ea0b2bfcbe556b50b1db6e50 | |
| parent | 88196fa62bae3ebec563d6df625edb84bbb334dc (diff) | |
WIP: Fix fetching Uranium
| -rw-r--r-- | .github/workflows/cicd.yml | 23 | ||||
| -rwxr-xr-x | docker/build.sh | 3 |
2 files changed, 22 insertions, 4 deletions
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 54747e55af..7029475573 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -1,6 +1,6 @@ --- -name: CI/CD -on: [push, pull_request] +name: CI/CD for push +on: push jobs: build: name: Build and test @@ -8,6 +8,23 @@ jobs: container: ultimaker/cura-build-environment steps: - name: Checkout code - uses: actions/checkout@v1.2.0 + uses: actions/checkout@v1 - name: Build and test + env: + GIT_REF_NAME: github.ref + run: docker/build.sh + +name: CI/CD for pull_request +on: pull_request +jobs: + build: + name: Build and test + runs-on: ubuntu-latest + container: ultimaker/cura-build-environment + steps: + - name: Checkout code + uses: actions/checkout@v1 + - name: Build and test + env: + GIT_REF_NAME: github.base_ref run: docker/build.sh diff --git a/docker/build.sh b/docker/build.sh index eb20b18c0d..a772c00509 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -20,7 +20,8 @@ cd "${PROJECT_DIR}" # Check the branch to use: # 1. Use the Uranium branch with the branch same if it exists. # 2. Otherwise, use the default branch name "master" -URANIUM_BRANCH="${CI_COMMIT_REF_NAME:-master}" +echo "GIT_REF_NAME: ${GIT_REF_NAME}" +URANIUM_BRANCH="${GIT_REF_NAME:-master}" output="$(git ls-remote --heads https://github.com/Ultimaker/Uranium.git "${URANIUM_BRANCH}")" if [ -z "${output}" ]; then echo "Could not find Uranium banch ${URANIUM_BRANCH}, fallback to use master." |