Bläddra i källkod

build: fix snap check [skip ci]

Baptiste Augrain 5 månader sedan
förälder
incheckning
803289b688
3 ändrade filer med 20 tillägg och 3 borttagningar
  1. 2 2
      .github/workflows/insider-linux.yml
  2. 3 1
      .github/workflows/stable-linux.yml
  3. 15 0
      check_tags.sh

+ 2 - 2
.github/workflows/insider-linux.yml

@@ -205,7 +205,7 @@ jobs:
         env:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: ./get_pr.sh
-        if: env.DISABLED != 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Install GH
         run: ./install_gh.sh
@@ -508,7 +508,7 @@ jobs:
         platform:
         - amd64
         - arm64
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_INSIDER_SNAP != 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && needs.check.outputs.SHOULD_BUILD_SNAP != 'no' && vars.DISABLE_INSIDER_SNAP != 'yes'
 
     steps:
       - uses: actions/checkout@v4

+ 3 - 1
.github/workflows/stable-linux.yml

@@ -91,12 +91,14 @@ jobs:
         env:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: ./get_pr.sh
+        if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup GCC
         uses: egor-tensin/setup-gcc@v1
         with:
           version: 10
           platform: x64
+        if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
@@ -504,7 +506,7 @@ jobs:
         platform:
         - amd64
         - arm64
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_STABLE_SNAP != 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && needs.check.outputs.SHOULD_BUILD_SNAP != 'no' && vars.DISABLE_STABLE_SNAP != 'yes'
 
     steps:
       - uses: actions/checkout@v4

+ 15 - 0
check_tags.sh

@@ -303,6 +303,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
             export SHOULD_BUILD_TAR="no"
           fi
 
+          if [[ -z $( contains "arm64.snap" ) ]]; then
+            echo "Building on Linux arm64 because we have no SNAP"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_SNAP="no"
+          fi
+
           if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
             echo "Building on Linux arm64 because we have no REH archive"
             export SHOULD_BUILD="yes"
@@ -523,6 +530,13 @@ elif [[ "${ASSETS}" != "null" ]]; then
             export SHOULD_BUILD_APPIMAGE="no"
           fi
 
+          if [[ -z $( contains "amd64.snap" ) ]]; then
+            echo "Building on Linux x64 because we have no SNAP"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_SNAP="no"
+          fi
+
           if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
             echo "Building on Linux x64 because we have no REH archive"
             export SHOULD_BUILD="yes"
@@ -645,6 +659,7 @@ echo "SHOULD_BUILD_MSI_NOUP=${SHOULD_BUILD_MSI_NOUP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_REH=${SHOULD_BUILD_REH}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_REH_WEB=${SHOULD_BUILD_REH_WEB}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_RPM=${SHOULD_BUILD_RPM}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_SNAP=${SHOULD_BUILD_SNAP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_TAR=${SHOULD_BUILD_TAR}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_ZIP=${SHOULD_BUILD_ZIP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_SRC=${SHOULD_BUILD_SRC}" >> "${GITHUB_ENV}"