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

bokysan · Oct 27, 2023 · b3c6faf · b3c6faf
1 parent bb5a9f3
commit b3c6faf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -57,7 +57,6 @@ jobs:
  needs:
  - Unit_Tests
  - Integration_Tests
- - Helm_chart_Tests
  steps:
  # Checkout
  - name: Checkout
@@ -111,7 +110,6 @@ jobs:
  needs:
  - Unit_Tests
  - Integration_Tests
- - Helm_chart_Tests
  steps:
  # Checkout
  - name: Checkout
@@ -156,7 +154,6 @@ jobs:
  needs:
  - Unit_Tests
  - Integration_Tests
- - Helm_chart_Tests
  steps:
  # Checkout
  - name: Checkout

diff --git a/build-scripts/postfix-install.sh b/build-scripts/postfix-install.sh
@@ -15,7 +15,7 @@ do_alpine() {
 
 do_ubuntu() {
  RELEASE_SPECIFIC_PACKAGES="netcat"
- if [ "${ID}" -eq "debian" ]; then
+ if [ "${ID}" = "debian" ]; then
  RELEASE_SPECIFIC_PACKAGES="netcat-openbsd"
  fi
  export DEBIAN_FRONTEND=noninteractive

diff --git a/build-scripts/sasl-build.sh b/build-scripts/sasl-build.sh
@@ -2,21 +2,16 @@
 set -e
 
 build_pandoc() {
- CAN_INSTALL=1
  if [ -f /etc/alpine-release ]; then
- if ! apk add --upgrade pandoc; then
- CAN_INSTALL=0
+ if apk add --upgrade pandoc; then
+ return
  fi
  else
- if ! apt-get install -y --no-install-recommends; then
- CAN_INSTALL=0
+ if apt-get install -y --no-install-recommends pandoc; then
+ return
  fi
  fi
 
- if [ "${CAN_INSTALL}" -eq "1" ; then
- return
- fi
-
  if [ -f /etc/alpine-release ]; then
  apk add --upgrade cabal curl llvm
  else