From b246c6d7e2ced8c78077fcbf1af853c7ef8e8fc0 Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 4 Jun 2022 17:25:46 +0200 Subject: [PATCH] fix wrong branch name in actions and image name for linux tests --- .github/workflows/prod.yml | 4 ++-- tests/linux.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index 576e1c6..61219ab 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -151,7 +151,7 @@ jobs: - name: Set variables run: | - if [ "$GITHUB_REF" = "refs/heads/main" ] ; then + if [ "$GITHUB_REF" = "refs/heads/master" ] ; then echo "BUILD_MODE=prod" >> $GITHUB_ENV else echo "BUILD_MODE=dev" >> $GITHUB_ENV @@ -203,7 +203,7 @@ jobs: uses: docker/login-action@v1 with: registry: ${{ secrets.PRIVATE_REGISTRY }} - username: nologin + username: registry password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} - name: Build and push BW prod image diff --git a/tests/linux.sh b/tests/linux.sh index f5a1f32..9119042 100755 --- a/tests/linux.sh +++ b/tests/linux.sh @@ -12,7 +12,7 @@ function gen_package() { type="deb" fi if [ "$mode" = "dev" ] ; then - do_and_check_cmd docker run --rm -v "/tmp/packages/${linux}:/data" "bw-${linux}-${mode}:latest" + do_and_check_cmd docker run --rm -v "/tmp/packages/${linux}:/data" "bw-${linux}-tests:latest" fi name="bunkerweb_${version}-1_amd64" if [ "$type" = "rpm" ] ; then