bokysan/docker-postfix
1
1
Fork 0
mirror of https://github.com/bokysan/docker-postfix.git synced 2025-09-07 06:56:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Fix integration tests with the new sasl-build script

Browse source
This commit is contained in:
Bojan Čekrlić 2023-10-27 12:39:06 +02:00
parent bb5a9f3e24
commit b3c6fafa4d
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/master.yml vendored
View file

@ -57,7 +57,6 @@ jobs:
needs: needs:
- Unit_Tests - Unit_Tests
- Integration_Tests - Integration_Tests
- Helm_chart_Tests
steps: steps:
# Checkout # Checkout
- name: Checkout - name: Checkout
@ -111,7 +110,6 @@ jobs:
needs: needs:
- Unit_Tests - Unit_Tests
- Integration_Tests - Integration_Tests
- Helm_chart_Tests
steps: steps:
# Checkout # Checkout
- name: Checkout - name: Checkout
@ -156,7 +154,6 @@ jobs:
needs: needs:
- Unit_Tests - Unit_Tests
- Integration_Tests - Integration_Tests
- Helm_chart_Tests
steps: steps:
# Checkout # Checkout
- name: Checkout - name: Checkout

2
build-scripts/postfix-install.sh
View file

@ -15,7 +15,7 @@ do_alpine() {
do_ubuntu() { do_ubuntu() {
RELEASE_SPECIFIC_PACKAGES="netcat" RELEASE_SPECIFIC_PACKAGES="netcat"
if [ "${ID}" -eq "debian" ]; then if [ "${ID}" = "debian" ]; then
RELEASE_SPECIFIC_PACKAGES="netcat-openbsd" RELEASE_SPECIFIC_PACKAGES="netcat-openbsd"
fi fi
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive

13
build-scripts/sasl-build.sh
View file

@ -2,20 +2,15 @@
set -e set -e
build_pandoc() { build_pandoc() {
CAN_INSTALL=1
if [ -f /etc/alpine-release ]; then if [ -f /etc/alpine-release ]; then
if ! apk add --upgrade pandoc; then if apk add --upgrade pandoc; then
CAN_INSTALL=0 return
fi fi
else else
if ! apt-get install -y --no-install-recommends; then if apt-get install -y --no-install-recommends pandoc; then
CAN_INSTALL=0
fi
fi
if [ "${CAN_INSTALL}" -eq "1" ; then
return return
fi fi
fi
if [ -f /etc/alpine-release ]; then if [ -f /etc/alpine-release ]; then
apk add --upgrade cabal curl llvm apk add --upgrade cabal curl llvm