Skip to content

Commit bbda78c

Browse files
vszakatsvszakats
committed
Revert "make CI jobs testable without docker hub/quay login creds"
This reverts commit 6d4a51d.
1 parent 6d4a51d commit bbda78c

File tree

5 files changed

+20
-40
lines changed

5 files changed

+20
-40
lines changed

‎.github/workflows/build_ci_multi.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,15 @@ jobs:
2929
DOCKER_HUB_USER: '${{ secrets.DOCKER_HUB_USER }}'
3030
DOCKER_HUB_TOKEN: '${{ secrets.DOCKER_HUB_TOKEN }}'
3131
run: |
32-
if [ -n "${DOCKER_HUB_USER:+1}" ]; then
33-
podman login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}" docker.io
34-
docker login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}"
35-
fi
32+
podman login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}" docker.io
33+
docker login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}"
3634
- name: "login quay.io"
3735
env:
3836
QUAY_USER: '${{ secrets.QUAY_USER }}'
3937
QUAY_TOKEN: '${{ secrets.QUAY_TOKEN }}'
4038
run: |
41-
if [ -n "${QUAY_USER:+1}" ]; then
42-
podman login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
43-
docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
44-
fi
39+
podman login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
40+
docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
4541
- name: Checkout repository
4642
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4743
with:

‎.github/workflows/build_latest_release_multi.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,15 @@ jobs:
3939
DOCKER_HUB_USER: '${{ secrets.DOCKER_HUB_USER }}'
4040
DOCKER_HUB_TOKEN: '${{ secrets.DOCKER_HUB_TOKEN }}'
4141
run: |
42-
if [ -n "${DOCKER_HUB_USER:+1}" ]; then
43-
podman login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}" docker.io
44-
docker login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}"
45-
fi
42+
podman login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}" docker.io
43+
docker login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}"
4644
- name: "login quay.io"
4745
env:
4846
QUAY_USER: '${{ secrets.QUAY_USER }}'
4947
QUAY_TOKEN: '${{ secrets.QUAY_TOKEN }}'
5048
run: |
51-
if [ -n "${QUAY_USER:+1}" ]; then
52-
podman login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
53-
docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
54-
fi
49+
podman login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
50+
docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
5551
- run: |
5652
sudo apt-get update
5753
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam

‎.github/workflows/build_master.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,15 @@ jobs:
4141
DOCKER_HUB_USER: '${{ secrets.DOCKER_HUB_USER }}'
4242
DOCKER_HUB_TOKEN: '${{ secrets.DOCKER_HUB_TOKEN }}'
4343
run: |
44-
if [ -n "${DOCKER_HUB_USER:+1}" ]; then
45-
podman login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}" docker.io
46-
docker login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}"
47-
fi
44+
podman login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}" docker.io
45+
docker login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}"
4846
- name: "login quay.io"
4947
env:
5048
QUAY_USER: '${{ secrets.QUAY_USER }}'
5149
QUAY_TOKEN: '${{ secrets.QUAY_TOKEN }}'
5250
run: |
53-
if [ -n "${QUAY_USER:+1}" ]; then
54-
podman login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
55-
docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
56-
fi
51+
podman login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
52+
docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
5753
- run: |
5854
sudo apt-get update
5955
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam

‎.github/workflows/build_master_dev.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,15 @@ jobs:
4242
DOCKER_HUB_USER: '${{ secrets.DOCKER_HUB_USER }}'
4343
DOCKER_HUB_TOKEN: '${{ secrets.DOCKER_HUB_TOKEN }}'
4444
run: |
45-
if [ -n "${DOCKER_HUB_USER:+1}" ]; then
46-
podman login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}" docker.io
47-
docker login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}"
48-
fi
45+
podman login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}" docker.io
46+
docker login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}"
4947
- name: "login quay.io"
5048
env:
5149
QUAY_USER: '${{ secrets.QUAY_USER }}'
5250
QUAY_TOKEN: '${{ secrets.QUAY_TOKEN }}'
5351
run: |
54-
if [ -n "${QUAY_USER:+1}" ]; then
55-
podman login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
56-
docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
57-
fi
52+
podman login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
53+
docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
5854
- run: |
5955
sudo apt-get update
6056
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam

‎.github/workflows/build_master_multi.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,15 @@ jobs:
4141
DOCKER_HUB_USER: '${{ secrets.DOCKER_HUB_USER }}'
4242
DOCKER_HUB_TOKEN: '${{ secrets.DOCKER_HUB_TOKEN }}'
4343
run: |
44-
if [ -n "${DOCKER_HUB_USER:+1}" ]; then
45-
podman login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}" docker.io
46-
docker login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}"
47-
fi
44+
podman login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}" docker.io
45+
docker login -u "${DOCKER_HUB_USER}" -p "${DOCKER_HUB_TOKEN}"
4846
- name: "login quay.io"
4947
env:
5048
QUAY_USER: '${{ secrets.QUAY_USER }}'
5149
QUAY_TOKEN: '${{ secrets.QUAY_TOKEN }}'
5250
run: |
53-
if [ -n "${QUAY_USER:+1}" ]; then
54-
podman login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
55-
docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
56-
fi
51+
podman login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
52+
docker login -u "${QUAY_USER}" -p "${QUAY_TOKEN}" quay.io
5753
- run: |
5854
sudo apt-get update
5955
sudo apt-get -y install qemu-user-static buildah less git make podman clamav clamav-freshclam

0 commit comments

Comments
 (0)