Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix wrong branch name in actions and image name for linux tests

Browse Source
This commit is contained in:
florian 2022-06-04 17:25:46 +02:00
parent b78fd55427
commit b246c6d7e2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/prod.yml vendored
View File

@ -151,7 +151,7 @@ jobs:
- name: Set variables - name: Set variables
run: | run: |
if [ "$GITHUB_REF" = "refs/heads/main" ] ; then if [ "$GITHUB_REF" = "refs/heads/master" ] ; then
echo "BUILD_MODE=prod" >> $GITHUB_ENV echo "BUILD_MODE=prod" >> $GITHUB_ENV
else else
echo "BUILD_MODE=dev" >> $GITHUB_ENV echo "BUILD_MODE=dev" >> $GITHUB_ENV
@ -203,7 +203,7 @@ jobs:
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
registry: ${{ secrets.PRIVATE_REGISTRY }} registry: ${{ secrets.PRIVATE_REGISTRY }}
username: nologin username: registry
password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
- name: Build and push BW prod image - name: Build and push BW prod image

2
tests/linux.sh
View File

@ -12,7 +12,7 @@ function gen_package() {
type="deb" type="deb"
fi fi
if [ "$mode" = "dev" ] ; then 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 fi
name="bunkerweb_${version}-1_amd64" name="bunkerweb_${version}-1_amd64"
if [ "$type" = "rpm" ] ; then if [ "$type" = "rpm" ] ; then