From 32f234f4fc012eddcfa1ff1c90b1f88f9d79ec9e Mon Sep 17 00:00:00 2001 From: Ganesh Gore Date: Mon, 18 Oct 2021 12:31:08 -0600 Subject: [PATCH] Made LNIS Repo as default --- .github/workflows/build.yml | 11 ++++++----- .github/workflows/docker.yml | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69d9f8fae..3734ab726 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,8 +50,8 @@ jobs: echo "name=docker_repo::$DOCKER_REPO" echo "::set-output name=docker_repo::$DOCKER_REPO" else - echo "name=docker_repo::$REPO_OWNER" - echo "::set-output name=docker_repo::$REPO_OWNER" + echo "name=docker_repo::lnis-uofu" + echo "::set-output name=docker_repo::lnis-uofu" fi echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" @@ -190,9 +190,10 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx + if: ${{ env.DOCKER_REPO }} uses: docker/setup-buildx-action@v1 - name: Login to GitHub Container Registry - if: ${{ (github.ref == 'refs/heads/master') || (needs.change_detect.outputs.force_upload == true) }} + if: ${{ (github.ref == 'refs/heads/master' && (env.DOCKER_REPO)) || (needs.change_detect.outputs.force_upload == true) }} uses: docker/login-action@v1 with: registry: ghcr.io @@ -203,15 +204,15 @@ jobs: with: context: . file: ./docker/Dockerfile.master - push: ${{ github.ref == 'refs/heads/master' || needs.change_detect.outputs.force_upload }} + push: ${{ (github.ref == 'refs/heads/master' && (env.DOCKER_REPO)) || needs.change_detect.outputs.force_upload }} tags: | ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-master:latest ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-master:${{ needs.change_detect.outputs.sha_short }} linux_regression_tests: name: linux_regression_tests runs-on: ubuntu-18.04 + needs: [linux_build, change_detect] container: ghcr.io/${{ needs.change_detect.outputs.docker_repo }}/openfpga-env - needs: linux_build strategy: fail-fast: false matrix: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 27bbf3d42..daa82ba45 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -21,8 +21,8 @@ jobs: echo "name=docker_repo::$DOCKER_REPO" echo "::set-output name=docker_repo::$DOCKER_REPO" else - echo "name=docker_repo::$REPO_OWNER" - echo "::set-output name=docker_repo::$REPO_OWNER" + echo "name=docker_repo::lnis-uofu" + echo "::set-output name=docker_repo::lnis-uofu" fi - name: Set up QEMU uses: docker/setup-qemu-action@v1