mirror of
https://github.com/chatmail/relay.git
synced 2026-05-20 04:48:06 +00:00
docker/ci: don't run the regular deploys for the j4n/docker-pr branch
This commit is contained in:
16
.github/workflows/docker-ci.yaml
vendored
16
.github/workflows/docker-ci.yaml
vendored
@@ -85,7 +85,7 @@ jobs:
|
|||||||
echo "image=${IMAGE}" >> "$GITHUB_OUTPUT"
|
echo "image=${IMAGE}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
name: Deploy to ${{ matrix.host }}
|
name: Deploy docker image to ${{ matrix.host }}
|
||||||
needs: build
|
needs: build
|
||||||
if: github.event_name == 'push'
|
if: github.event_name == 'push'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -100,12 +100,12 @@ jobs:
|
|||||||
zone_file: staging.testrun.org-default.zone
|
zone_file: staging.testrun.org-default.zone
|
||||||
disable_ipv6: false
|
disable_ipv6: false
|
||||||
add_ssh_keys: true
|
add_ssh_keys: true
|
||||||
- host: staging-ipv4.testrun.org
|
# - host: staging-ipv4.testrun.org
|
||||||
acme_dir: acme-ipv4
|
# acme_dir: acme-ipv4
|
||||||
dkim_dir: dkimkeys-ipv4
|
# dkim_dir: dkimkeys-ipv4
|
||||||
zone_file: staging-ipv4.testrun.org-default.zone
|
# zone_file: staging-ipv4.testrun.org-default.zone
|
||||||
disable_ipv6: true
|
# disable_ipv6: true
|
||||||
add_ssh_keys: false
|
# add_ssh_keys: false
|
||||||
environment:
|
environment:
|
||||||
name: ${{ matrix.host }}
|
name: ${{ matrix.host }}
|
||||||
url: https://${{ matrix.host }}/
|
url: https://${{ matrix.host }}/
|
||||||
@@ -229,7 +229,7 @@ jobs:
|
|||||||
ssh root@${HOST} 'cd /srv/chatmail/relay && docker compose logs --tail=200'
|
ssh root@${HOST} 'cd /srv/chatmail/relay && docker compose logs --tail=200'
|
||||||
exit 1
|
exit 1
|
||||||
|
|
||||||
- name: add hpk42 key to staging server
|
- name: add ssh keys to staging server
|
||||||
if: matrix.add_ssh_keys
|
if: matrix.add_ssh_keys
|
||||||
run: ssh root@${{ matrix.host }} 'curl -s https://github.com/hpk42.keys https://github.com/j4n.keys >> .ssh/authorized_keys'
|
run: ssh root@${{ matrix.host }} 'curl -s https://github.com/hpk42.keys https://github.com/j4n.keys >> .ssh/authorized_keys'
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
name: deploy on staging-ipv4.testrun.org, and run tests
|
name: deploy on staging-ipv4.testrun.org, and run tests
|
||||||
|
if: ${{ !startsWith(github.head_ref, 'j4n/') }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
1
.github/workflows/test-and-deploy.yaml
vendored
1
.github/workflows/test-and-deploy.yaml
vendored
@@ -14,6 +14,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
name: deploy on staging2.testrun.org, and run tests
|
name: deploy on staging2.testrun.org, and run tests
|
||||||
|
if: ${{ !startsWith(github.head_ref, 'j4n/') }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
Reference in New Issue
Block a user