From 47d2900f37567dd82576a4a2f7421899b5560a3b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 24 Jun 2026 14:55:38 +0200 Subject: [PATCH] automatically activate os specific maven profiles --- .github/workflows/appimage.yml | 2 +- .github/workflows/debian.yml | 2 +- .github/workflows/draft-release.yml | 2 +- dist/linux/appimage/build.sh | 2 +- .../org.cryptomator.Cryptomator.TEMPLATE.yaml | 2 +- dist/linux/makepkg/PKGBUILD.template | 2 +- pom.xml | 16 ++-------------- 7 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 5dca04c32..344a86e11 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -106,7 +106,7 @@ jobs: - name: Set version run : ./mvnw versions:set -DnewVersion="${VERSION_NUM}${VERSION_SUFFIX}" - name: Run maven - run: ./mvnw -B clean package -Plinux -DskipTests + run: ./mvnw -B clean package -DskipTests - name: Patch target dir run: | cp LICENSE.txt target diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 4b2063f4d..f0d76d6e7 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -70,7 +70,7 @@ jobs: check-latest: true cache: 'maven' - name: Run maven - run: ./mvnw -B clean package -Plinux -DskipTests + run: ./mvnw -B clean package -DskipTests - name: Download OpenJFX jmods id: download-jmods run: | diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 427e7d276..45221d36f 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -38,7 +38,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - name: Build and Test - run: xvfb-run ./mvnw -B verify -Plinux + run: xvfb-run ./mvnw -B verify env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - name: Draft a release diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index 8440dd14c..6c6cfd595 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -19,7 +19,7 @@ if [[ ! "${CPU_ARCH}" =~ x86_64|aarch64 ]]; then echo "Platform ${CPU_ARCH} not ../../../mvnw -f ../../../pom.xml versions:set -DnewVersion=${SEMVER_STR} # compile -../../../mvnw -B -f ../../../pom.xml clean package -Plinux -DskipTests +../../../mvnw -B -f ../../../pom.xml clean package -DskipTests cp ../../../LICENSE.txt ../../../target cp ../../../target/cryptomator-*.jar ../../../target/mods diff --git a/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml b/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml index dceea22c5..d65f6f1ea 100644 --- a/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml +++ b/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml @@ -94,7 +94,7 @@ modules: - mkdir maven - tar xf maven.tar.gz --strip-components=1 --exclude=jansi-native --directory=maven # Build project - - maven/bin/mvn clean package -DskipTests -P"linux-$(uname -m)" + - maven/bin/mvn clean package -DskipTests - cp target/cryptomator-*.jar target/mods - cd target - $JAVA_HOME/bin/jlink diff --git a/dist/linux/makepkg/PKGBUILD.template b/dist/linux/makepkg/PKGBUILD.template index 41764e40b..cad044b1d 100644 --- a/dist/linux/makepkg/PKGBUILD.template +++ b/dist/linux/makepkg/PKGBUILD.template @@ -47,7 +47,7 @@ build() { cd "${srcdir}/${_src_app_dir}" - mvn -B clean package -DskipTests -Plinux + mvn -B clean package -DskipTests cp LICENSE.txt target cp target/cryptomator-*.jar target/mods diff --git a/pom.xml b/pom.xml index f5f25e8cd..4e66590f4 100644 --- a/pom.xml +++ b/pom.xml @@ -502,9 +502,6 @@ mac - - idea.version - @@ -520,12 +517,9 @@ unix - Linux + linux aarch64 - - idea.version - @@ -565,12 +559,9 @@ unix - Linux + linux amd64 - - idea.version - @@ -587,9 +578,6 @@ windows - - idea.version -