diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 0bd519d39..26d455b8f 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -13,40 +13,25 @@ env: JAVA_VERSION: 19 jobs: + get-version: + uses: ./.github/workflows/get-version.yml + with: + version: ${{ github.event.inputs.version }} + build: name: Build AppImage runs-on: ubuntu-latest + needs: [get-version] steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Setup Java uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - - id: versions - name: Apply version information - run: | - if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR=${GITHUB_REF##*/} - mvn versions:set -DnewVersion=${SEM_VER_STR} - elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR="${{ github.event.inputs.version }}" - mvn versions:set -DnewVersion=${SEM_VER_STR} - else - SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` - fi - SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` - REVCOUNT=`git rev-list --count HEAD` - echo "::set-output name=semVerStr::${SEM_VER_STR}" - echo "::set-output name=semVerNum::${SEM_VER_NUM}" - echo "::set-output name=revNum::${REVCOUNT}" - - name: Validate Version - uses: skymatic/semver-validation-action@v1 - with: - version: ${{ steps.versions.outputs.semVerStr }} + - name: Set version + run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven run: mvn -B clean package -Pdependency-check,linux -DskipTests - name: Patch target dir @@ -69,8 +54,8 @@ jobs: - name: Prepare additional launcher run: envsubst '${SEMVER_STR} ${REVISION_NUM}' < dist/linux/launcher-gtk2.properties > launcher-gtk2.properties env: - SEMVER_STR: ${{ steps.versions.outputs.semVerStr }} - REVISION_NUM: ${{ steps.versions.outputs.revNum }} + SEMVER_STR: ${{ needs.get-version.outputs.semVerStr }} + REVISION_NUM: ${{ needs.get-version.outputs.revNum }} - name: Run jpackage run: > ${JAVA_HOME}/bin/jpackage @@ -84,10 +69,10 @@ jobs: --name Cryptomator --vendor "Skymatic GmbH" --copyright "(C) 2016 - 2022 Skymatic GmbH" - --app-version "${{ steps.versions.outputs.semVerNum }}.${{ steps.versions.outputs.revNum }}" + --app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}" --java-options "-Xss5m" --java-options "-Xmx256m" - --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\"" + --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\"" --java-options "-Dfile.encoding=\"utf-8\"" --java-options "-Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\"" --java-options "-Dcryptomator.pluginDir=\"~/.local/share/Cryptomator/plugins\"" @@ -96,7 +81,7 @@ jobs: --java-options "-Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\"" --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" --java-options "-Dcryptomator.showTrayIcon=false" - --java-options "-Dcryptomator.buildNumber=\"appimage-${{ steps.versions.outputs.revNum }}\"" + --java-options "-Dcryptomator.buildNumber=\"appimage-${{ needs.get-version.outputs.revNum }}\"" --add-launcher Cryptomator-gtk2=launcher-gtk2.properties --resource-dir dist/linux/resources - name: Patch Cryptomator.AppDir @@ -134,7 +119,7 @@ jobs: GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }} - name: Build AppImage run: > - ./squashfs-root/AppRun Cryptomator.AppDir cryptomator-${{ steps.versions.outputs.semVerStr }}-x86_64.AppImage + ./squashfs-root/AppRun Cryptomator.AppDir cryptomator-${{ needs.get-version.outputs.semVerStr }}-x86_64.AppImage -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-x86_64.AppImage.zsync' --sign --sign-key=615D449FE6E6A235 --sign-args="--batch --pinentry-mode loopback" - name: Create detached GPG signatures diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 500587444..a194d4ad1 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -18,13 +18,17 @@ env: JAVA_VERSION: 19 jobs: + get-version: + uses: ./.github/workflows/get-version.yml + with: + version: ${{ github.event.inputs.version }} + build: name: Build Debian Package runs-on: ubuntu-20.04 + needs: [get-version] steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Install build tools run: | sudo add-apt-repository ppa:coffeelibs/openjdk @@ -36,28 +40,12 @@ jobs: distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - - id: versions - name: Apply version information - run: | - if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR=${GITHUB_REF##*/} - mvn versions:set -DnewVersion=${SEM_VER_STR} - elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR="${{ github.event.inputs.version }}" - mvn versions:set -DnewVersion=${SEM_VER_STR} - else - SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` - fi - SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` - REVCOUNT=`git rev-list --count HEAD` - echo "::set-output name=semVerStr::${SEM_VER_STR}" - echo "::set-output name=semVerNum::${SEM_VER_NUM}" - echo "::set-output name=revNum::${REVCOUNT}" - echo "::set-output name=ppaVerStr::${SEM_VER_STR/-/\~}-${REVCOUNT}" - - name: Validate Version - uses: skymatic/semver-validation-action@v1 - with: - version: ${{ steps.versions.outputs.semVerStr }} + - id: versions + name: Create PPA version string + run: echo "ppaVerStr=${SEM_VER_STR/-/\~}-${REVCOUNT}" >> $GITHUB_OUTPUT + env: + SEM_VER_STR: ${{ needs.get-version.outputs.semVerStr }} + REVCOUNT: ${{ needs.get-version.outputs.revNum }} - name: Run maven run: mvn -B clean package -Pdependency-check,linux -DskipTests - name: Create orig.tar.gz with common/ libs/ mods/ @@ -77,9 +65,9 @@ jobs: find . -name "*.jar" >> pkgdir/debian/source/include-binaries mv pkgdir cryptomator_${{ steps.versions.outputs.ppaVerStr }} env: - SEMVER_STR: ${{ steps.versions.outputs.semVerStr }} - VERSION_NUM: ${{ steps.versions.outputs.semVerNum }} - REVISION_NUM: ${{ steps.versions.outputs.revNum }} + SEMVER_STR: ${{ needs.get-version.outputs.semVerStr }} + VERSION_NUM: ${{ needs.get-version.outputs.semVerNum }} + REVISION_NUM: ${{ needs.get-version.outputs.revNum }} PPA_VERSION: ${{ steps.versions.outputs.ppaVerStr }}-0ppa1 - name: Prepare GPG-Agent for signing with key 615D449FE6E6A235 run: | diff --git a/.github/workflows/dl-stats.yml b/.github/workflows/dl-stats.yml index 0d9ca5dd7..dc87a2bbd 100644 --- a/.github/workflows/dl-stats.yml +++ b/.github/workflows/dl-stats.yml @@ -48,7 +48,7 @@ jobs: jq -c 'select(.filename|endswith(".dmg")) | select(.filename|endswith("-arm64.dmg")|not) | {name: "github.releases.downloads", tags: ["file=dmg", "version=\(.release)", "arch=amd64"], value: .downloads, interval: .interval, time: .time}' input.json >> output.json RESULT=$(jq -s -c "." output.json) - echo "::set-output name=result::${RESULT}" + echo "result=${RESULT}" >> $GITHUB_OUTPUT env: INTERVAL: 900 JSON_DATA: ${{ steps.get-stats.outputs.result }} diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml new file mode 100644 index 000000000..e6131b835 --- /dev/null +++ b/.github/workflows/get-version.yml @@ -0,0 +1,77 @@ +name: Parse and Validate a version string or tag + +on: + workflow_call: + inputs: + version: + description: "A specific version to use" + required: false + type: string + outputs: + semVerStr: + description: "The full version string." + value: ${{ jobs.determine-version.outputs.semVerStr}} + semVerNum: + description: "The numerical part of the version string" + value: ${{ jobs.determine-version.outputs.semVerNum}} + revNum: + description: "The revision number" + value: ${{ jobs.determine-version.outputs.revNum}} + versionType: + description: "Type of the version. Values are [stable, alpha, beta, rc, unknown]" + value: ${{ jobs.determine-version.outputs.type }} + +env: + JAVA_VERSION: 19 + JAVA_DIST: 'temurin' + JAVA_CACHE: 'maven' + +jobs: + determine-version: + name: 'Determines the version following semver' + runs-on: ubuntu-latest + outputs: + semVerNum: ${{ steps.versions.outputs.semVerNum }} + semVerStr: ${{ steps.versions.outputs.semVerStr }} + revNum: ${{ steps.versions.outputs.revNum }} + type: ${{ steps.versions.outputs.type}} + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: ${{ env.JAVA_DIST }} + java-version: ${{ env.JAVA_VERSION }} + cache: ${{ env.JAVA_CACHE }} + - id: versions + name: Get version information + run: | + if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then + SEM_VER_STR=${GITHUB_REF##*/} + elif [[ "${{ inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then + SEM_VER_STR="${{ github.event.inputs.version }}" + else + SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` + fi + SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` + REVCOUNT=`git rev-list --count HEAD` + TYPE="unknown" + if [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then + TYPE="stable" + elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-alpha[1-9] ]]; then + TYPE="alpha" + elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-beta[1-9] ]]; then + TYPE="beta" + elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-rc[1-9] ]]; then + TYPE="rc" + fi + echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT + echo "semVerNum=${SEM_VER_NUM}" >> $GITHUB_OUTPUT + echo "revNum=${REVCOUNT}" >> $GITHUB_OUTPUT + echo "type=${TYPE}" >> $GITHUB_OUTPUT + - name: Validate Version + uses: skymatic/semver-validation-action@v2 + with: + version: ${{ steps.versions.outputs.semVerStr }} \ No newline at end of file diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index b51430ee0..4f06953be 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -13,9 +13,15 @@ env: JAVA_VERSION: 19 jobs: + get-version: + uses: ./.github/workflows/get-version.yml + with: + version: ${{ github.event.inputs.version }} + build: name: Build Cryptomator.app for ${{ matrix.output-suffix }} runs-on: ${{ matrix.os }} + needs: [get-version] strategy: fail-fast: false matrix: @@ -30,8 +36,6 @@ jobs: xcode-path: '/Applications/Xcode_13.2.1.app' steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Setup Java uses: actions/setup-java@v3 with: @@ -39,27 +43,8 @@ jobs: java-version: ${{ env.JAVA_VERSION }} architecture: ${{ matrix.architecture }} cache: 'maven' - - id: versions - name: Apply version information - run: | - if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR=${GITHUB_REF##*/} - mvn versions:set -DnewVersion=${SEM_VER_STR} - elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR="${{ github.event.inputs.version }}" - mvn versions:set -DnewVersion=${SEM_VER_STR} - else - SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` - fi - SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` - REVCOUNT=`git rev-list --count HEAD` - echo "::set-output name=semVerStr::${SEM_VER_STR}" - echo "::set-output name=semVerNum::${SEM_VER_NUM}" - echo "::set-output name=revNum::${REVCOUNT}" - - name: Validate Version - uses: skymatic/semver-validation-action@v1 - with: - version: ${{ steps.versions.outputs.semVerStr }} + - name: Set version + run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven run: mvn -B clean package -Pdependency-check,mac -DskipTests - name: Patch target dir @@ -92,13 +77,13 @@ jobs: --name Cryptomator --vendor "Skymatic GmbH" --copyright "(C) 2016 - 2022 Skymatic GmbH" - --app-version "${{ steps.versions.outputs.semVerNum }}" + --app-version "${{ needs.get-version.outputs.semVerNum }}" --java-options "-Xss5m" --java-options "-Xmx256m" --java-options "-Dfile.encoding=\"utf-8\"" --java-options "-Dapple.awt.enableTemplateImages=true" --java-options "-Dsun.java2d.metal=true" - --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\"" + --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\"" --java-options "-Dcryptomator.logDir=\"~/Library/Logs/Cryptomator\"" --java-options "-Dcryptomator.pluginDir=\"~/Library/Application Support/Cryptomator/Plugins\"" --java-options "-Dcryptomator.settingsPath=\"~/Library/Application Support/Cryptomator/settings.json\"" @@ -106,7 +91,7 @@ jobs: --java-options "-Dcryptomator.ipcSocketPath=\"~/Library/Application Support/Cryptomator/ipc.socket\"" --java-options "-Dcryptomator.integrationsMac.keychainServiceName=\"Cryptomator\"" --java-options "-Dcryptomator.showTrayIcon=true" - --java-options "-Dcryptomator.buildNumber=\"dmg-${{ steps.versions.outputs.revNum }}\"" + --java-options "-Dcryptomator.buildNumber=\"dmg-${{ needs.get-version.outputs.revNum }}\"" --mac-package-identifier org.cryptomator --resource-dir dist/mac/resources - name: Patch Cryptomator.app @@ -116,8 +101,8 @@ jobs: sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" Cryptomator.app/Contents/Info.plist sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" Cryptomator.app/Contents/Info.plist env: - VERSION_NO: ${{ steps.versions.outputs.semVerNum }} - REVISION_NO: ${{ steps.versions.outputs.revNum }} + VERSION_NO: ${{ needs.get-version.outputs.semVerNum }} + REVISION_NO: ${{ needs.get-version.outputs.revNum }} - name: Generate license for dmg run: > mvn -B license:add-third-party @@ -151,6 +136,10 @@ jobs: CODESIGN_TMP_KEYCHAIN_PW: ${{ secrets.MACOS_CODESIGN_TMP_KEYCHAIN_PW }} - name: Codesign run: | + echo "Codesigning jdk files..." + find Cryptomator.app/Contents/runtime/Contents/Home/lib/ -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \; + find Cryptomator.app/Contents/runtime/Contents/Home/lib/ -name 'jspawnhelper' -exec codesign --force -o runtime -s ${CODESIGN_IDENTITY} {} \; + echo "Codesigning jar contents..." find Cryptomator.app/Contents/runtime/Contents/MacOS -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \; for JAR_PATH in `find Cryptomator.app -name "*.jar"`; do if [[ `unzip -l ${JAR_PATH} | grep '.dylib\|.jnilib'` ]]; then @@ -201,7 +190,7 @@ jobs: --icon ".VolumeIcon.icns" 512 758 Cryptomator-${VERSION_NO}-${{ matrix.output-suffix }}.dmg dmg env: - VERSION_NO: ${{ steps.versions.outputs.semVerNum }} + VERSION_NO: ${{ needs.get-version.outputs.semVerNum }} - name: Notarize .dmg if: startsWith(github.ref, 'refs/tags/') uses: cocoalibs/xcode-notarization-action@v1 @@ -212,7 +201,7 @@ jobs: team-id: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }} xcode-path: ${{ matrix.xcode-path }} - name: Add possible alpha/beta tags to installer name - run: mv Cryptomator-*.dmg Cryptomator-${{ steps.versions.outputs.semVerStr }}-${{ matrix.output-suffix }}.dmg + run: mv Cryptomator-*.dmg Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.output-suffix }}.dmg - name: Create detached GPG signature with key 615D449FE6E6A235 run: | echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml index e2f116130..7309cb852 100644 --- a/.github/workflows/release-check.yml +++ b/.github/workflows/release-check.yml @@ -30,7 +30,7 @@ jobs: fi if [[ ${SEM_VER_STR} == `mvn help:evaluate -Dexpression=project.version -q -DforceStdout` ]]; then - echo "::set-output name=semVerStr::${SEM_VER_STR}" + echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT else echo "Version not set in POM" exit 1 diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 332e1e725..0725c0329 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -19,52 +19,27 @@ defaults: shell: bash jobs: + get-version: + uses: ./.github/workflows/get-version.yml + with: + version: ${{ github.event.inputs.version }} + build-msi: name: Build .msi Installer runs-on: windows-latest + needs: [get-version] env: LOOPBACK_ALIAS: 'cryptomator-vault' - outputs: - semVerNum: ${{ steps.versions.outputs.semVerNum }} - semVerStr: ${{ steps.versions.outputs.semVerStr }} - revNum: ${{ steps.versions.outputs.revNum }} - isProductionVersion: ${{ steps.versions.outputs.isProductionVersion}} steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Setup Java uses: actions/setup-java@v3 with: distribution: ${{ env.JAVA_DIST }} java-version: ${{ env.JAVA_VERSION }} cache: ${{ env.JAVA_CACHE }} - - id: versions - name: Apply version information - run: | - if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR=${GITHUB_REF##*/} - mvn versions:set -DnewVersion=${SEM_VER_STR} - elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR="${{ github.event.inputs.version }}" - mvn versions:set -DnewVersion=${SEM_VER_STR} - else - SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` - fi - SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` - REVCOUNT=`git rev-list --count HEAD` - PRODUCTION_READY_VERSION="false" - if [[ $SEM_VER_STR =~ [0-9]+\.[0-9].[0-9]+ ]]; then - PRODUCTION_READY_VERSION="true" - fi - echo "::set-output name=semVerStr::${SEM_VER_STR}" - echo "::set-output name=semVerNum::${SEM_VER_NUM}" - echo "::set-output name=revNum::${REVCOUNT}" - echo "::set-output name=isProductionVersion::${PRODUCTION_READY_VERSION}" - - name: Validate Version - uses: skymatic/semver-validation-action@v1 - with: - version: ${{ steps.versions.outputs.semVerStr }} + - name: Set version + run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven run: mvn -B clean package -Pdependency-check,win -DskipTests - name: Patch target dir @@ -97,10 +72,10 @@ jobs: --name Cryptomator --vendor "Skymatic GmbH" --copyright "(C) 2016 - 2022 Skymatic GmbH" - --app-version "${{ steps.versions.outputs.semVerNum }}.${{ steps.versions.outputs.revNum }}" + --app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}" --java-options "-Xss5m" --java-options "-Xmx256m" - --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\"" + --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\"" --java-options "-Dfile.encoding=\"utf-8\"" --java-options "-Dcryptomator.logDir=\"~/AppData/Roaming/Cryptomator\"" --java-options "-Dcryptomator.pluginDir=\"~/AppData/Roaming/Cryptomator/Plugins\"" @@ -110,7 +85,7 @@ jobs: --java-options "-Dcryptomator.mountPointsDir=\"~/Cryptomator\"" --java-options "-Dcryptomator.loopbackAlias=\"${{ env.LOOPBACK_ALIAS }}\"" --java-options "-Dcryptomator.showTrayIcon=true" - --java-options "-Dcryptomator.buildNumber=\"msi-${{ steps.versions.outputs.revNum }}\"" + --java-options "-Dcryptomator.buildNumber=\"msi-${{ needs.get-version.outputs.revNum }}\"" --java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=\"Cryptomator\"" --java-options "-Dcryptomator.integrationsWin.keychainPaths=\"~/AppData/Roaming/Cryptomator/keychain.json\"" --resource-dir dist/win/resources @@ -132,7 +107,7 @@ jobs: run: attrib -r appdir/Cryptomator/Cryptomator.exe shell: pwsh - name: Codesign - uses: skymatic/code-sign-action@v1 + uses: skymatic/code-sign-action@v2 with: certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }} password: ${{ secrets.WIN_CODESIGN_P12_PW }} @@ -163,7 +138,7 @@ jobs: --name Cryptomator --vendor "Skymatic GmbH" --copyright "(C) 2016 - 2022 Skymatic GmbH" - --app-version "${{ steps.versions.outputs.semVerNum }}" + --app-version "${{ needs.get-version.outputs.semVerNum }}" --win-menu --win-dir-chooser --win-shortcut-prompt @@ -175,7 +150,7 @@ jobs: env: JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs - name: Codesign MSI - uses: skymatic/code-sign-action@v1 + uses: skymatic/code-sign-action@v2 with: certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }} password: ${{ secrets.WIN_CODESIGN_P12_PW }} @@ -184,7 +159,7 @@ jobs: timestampUrl: 'http://timestamp.digicert.com' folder: installer - name: Add possible alpha/beta tags to installer name - run: mv installer/Cryptomator-*.msi Cryptomator-${{ steps.versions.outputs.semVerStr }}-x64.msi + run: mv installer/Cryptomator-*.msi Cryptomator-${{ needs.get-version.outputs.semVerStr }}-x64.msi - name: Create detached GPG signature with key 615D449FE6E6A235 run: | echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import @@ -211,8 +186,8 @@ jobs: *.asc call-winget-flow: - needs: [build-msi] - if: github.event.action == 'published' && needs.build-msi.outputs.isProductionVersion + needs: [get-version, build-msi] + if: github.event.action == 'published' && needs.get-version.outputs.type == 'stable' uses: ./.github/workflows/winget.yml with: releaseTag: ${{ github.event.release.tag_name }} @@ -222,7 +197,7 @@ jobs: build-exe: name: Build .exe installer runs-on: windows-latest - needs: [build-msi] + needs: [get-version, build-msi] steps: - uses: actions/checkout@v3 - name: Download .msi @@ -258,7 +233,7 @@ jobs: "${WIX}/bin/candle.exe" dist/win/bundle/bundleWithWinfsp.wxs -ext WixBalExtension -out dist/win/bundle/ - -dBundleVersion="${{ needs.build-msi.outputs.semVerNum }}.${{ needs.build-msi.outputs.revNum }}" + -dBundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}" -dBundleVendor="Skymatic GmbH" -dBundleCopyright="(C) 2016 - 2022 Skymatic GmbH" -dAboutUrl="https://cryptomator.org" @@ -275,7 +250,7 @@ jobs: -ib installer/unsigned/Cryptomator-Installer.exe -o tmp/engine.exe - name: Codesign burn engine - uses: skymatic/code-sign-action@v1 + uses: skymatic/code-sign-action@v2 with: certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }} password: ${{ secrets.WIN_CODESIGN_P12_PW }} @@ -289,7 +264,7 @@ jobs: -ab tmp/engine.exe installer/unsigned/Cryptomator-Installer.exe -o installer/Cryptomator-Installer.exe - name: Codesign EXE - uses: skymatic/code-sign-action@v1 + uses: skymatic/code-sign-action@v2 with: certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }} password: ${{ secrets.WIN_CODESIGN_P12_PW }} @@ -298,7 +273,7 @@ jobs: timestampUrl: 'http://timestamp.digicert.com' folder: installer - name: Add possible alpha/beta tags to installer name - run: mv installer/Cryptomator-Installer.exe Cryptomator-${{ needs.build-msi.outputs.semVerStr }}-x64.exe + run: mv installer/Cryptomator-Installer.exe Cryptomator-${{ needs.get-version.outputs.semVerStr }}-x64.exe - name: Create detached GPG signature with key 615D449FE6E6A235 run: | echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import diff --git a/pom.xml b/pom.xml index 911d0e2e1..dcafa2a5d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.5.1 - 1.1.0 + 1.2.0-beta1 1.1.2 1.1.2 1.1.0 diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java index 432007c99..fe4ac3bd1 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java @@ -2,19 +2,20 @@ package org.cryptomator.ui.addvaultwizard; import dagger.Lazy; import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.common.settings.Settings; -import org.cryptomator.common.settings.UiTheme; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; +import org.cryptomator.integrations.uiappearance.Theme; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; +import org.cryptomator.ui.fxapp.FxApplicationStyle; import org.cryptomator.ui.fxapp.FxApplicationWindows; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; import javafx.beans.property.ObjectProperty; +import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.scene.Scene; import javafx.scene.image.Image; @@ -23,6 +24,7 @@ import javafx.stage.Stage; import java.io.File; import java.io.IOException; import java.nio.file.Path; +import java.util.Objects; import java.util.ResourceBundle; import static org.cryptomator.common.Constants.CRYPTOMATOR_FILENAME_GLOB; @@ -40,12 +42,10 @@ public class ChooseExistingVaultController implements FxController { private final ObjectProperty vault; private final VaultListManager vaultListManager; private final ResourceBundle resourceBundle; - private final Settings settings; - - private Image screenshot; + private final ObservableValue screenshot; @Inject - ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, FxApplicationWindows appWindows, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle, Settings settings) { + ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, FxApplicationWindows appWindows, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle, FxApplicationStyle applicationStyle) { this.window = window; this.welcomeScene = welcomeScene; this.successScene = successScene; @@ -54,16 +54,20 @@ public class ChooseExistingVaultController implements FxController { this.vault = vault; this.vaultListManager = vaultListManager; this.resourceBundle = resourceBundle; - this.settings = settings; + this.screenshot = applicationStyle.appliedThemeProperty().map(this::selectScreenshot); } - @FXML - public void initialize() { + private Image selectScreenshot(Theme theme) { + String imageResourcePath; if (SystemUtils.IS_OS_MAC) { - this.screenshot = new Image(getClass().getResource("/img/select-masterkey-mac"+(UiTheme.LIGHT == settings.theme().get()? "":"-dark")+".png").toString()); + imageResourcePath = switch (theme) { + case LIGHT -> "/img/select-masterkey-mac.png"; + case DARK -> "/img/select-masterkey-mac-dark.png"; + }; } else { - this.screenshot = new Image(getClass().getResource("/img/select-masterkey-win.png").toString()); + imageResourcePath = "/img/select-masterkey-win.png"; } + return new Image((Objects.requireNonNull(getClass().getResource(imageResourcePath)).toString())); } @FXML @@ -92,8 +96,13 @@ public class ChooseExistingVaultController implements FxController { /* Getter */ - public Image getScreenshot() { + public ObservableValue screenshotProperty() { return screenshot; } + public Image getScreenshot() { + return screenshot.getValue(); + } + + } diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java index 711da7948..b6681f728 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java @@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; import javafx.application.Application; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; import java.util.Optional; @@ -24,9 +26,10 @@ public class FxApplicationStyle { private final Optional appearanceProvider; private final LicenseHolder licenseHolder; private final UiAppearanceListener systemInterfaceThemeListener = this::systemInterfaceThemeChanged; + private final ObjectProperty appliedTheme = new SimpleObjectProperty<>(Theme.LIGHT); @Inject - public FxApplicationStyle(Settings settings, Optional appearanceProvider, LicenseHolder licenseHolder){ + public FxApplicationStyle(Settings settings, Optional appearanceProvider, LicenseHolder licenseHolder) { this.settings = settings; this.appearanceProvider = appearanceProvider; this.licenseHolder = licenseHolder; @@ -91,6 +94,7 @@ public class FxApplicationStyle { } else { Application.setUserAgentStylesheet(stylesheet.toString()); appearanceProvider.ifPresent(provider -> provider.adjustToTheme(Theme.LIGHT)); + appliedTheme.set(Theme.LIGHT); } } @@ -103,6 +107,11 @@ public class FxApplicationStyle { } else { Application.setUserAgentStylesheet(stylesheet.toString()); appearanceProvider.ifPresent(provider -> provider.adjustToTheme(Theme.DARK)); + appliedTheme.set(Theme.DARK); } } + + public ObjectProperty appliedThemeProperty() { + return appliedTheme; + } } diff --git a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java index 79f1dd628..c82cea239 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java +++ b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java @@ -1,5 +1,6 @@ package org.cryptomator.ui.traymenu; +import com.google.common.base.Preconditions; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.integrations.common.CheckAvailability; import org.cryptomator.integrations.common.Priority; @@ -19,6 +20,8 @@ import java.awt.PopupMenu; import java.awt.SystemTray; import java.awt.Toolkit; import java.awt.TrayIcon; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.List; @CheckAvailability @@ -28,6 +31,7 @@ public class AwtTrayMenuController implements TrayMenuController { private static final Logger LOG = LoggerFactory.getLogger(AwtTrayMenuController.class); private final PopupMenu menu = new PopupMenu(); + private TrayIcon trayIcon; @CheckAvailability public static boolean isAvailable() { @@ -37,7 +41,7 @@ public class AwtTrayMenuController implements TrayMenuController { @Override public void showTrayIcon(byte[] rawImageData, Runnable defaultAction, String tooltip) throws TrayMenuException { var image = Toolkit.getDefaultToolkit().createImage(rawImageData); - var trayIcon = new TrayIcon(image, tooltip, menu); + trayIcon = new TrayIcon(image, tooltip, menu); trayIcon.setImageAutoSize(true); if (SystemUtils.IS_OS_WINDOWS) { @@ -58,6 +62,18 @@ public class AwtTrayMenuController implements TrayMenuController { addChildren(menu, items); } + + @Override + public void onBeforeOpenMenu(Runnable listener) { + Preconditions.checkNotNull(this.trayIcon); + this.trayIcon.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + listener.run(); + } + }); + } + private void addChildren(Menu menu, List items) { for (var item : items) { // TODO: use Pattern Matching for switch, once available diff --git a/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java b/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java index ea7358770..e96446143 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java +++ b/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java @@ -3,6 +3,7 @@ package org.cryptomator.ui.traymenu; import com.google.common.base.Preconditions; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.vaults.Vault; +import org.cryptomator.common.vaults.VaultListManager; import org.cryptomator.integrations.tray.ActionItem; import org.cryptomator.integrations.tray.SeparatorItem; import org.cryptomator.integrations.tray.SubMenuItem; @@ -63,6 +64,11 @@ public class TrayMenuBuilder { try (var image = getClass().getResourceAsStream(SystemUtils.IS_OS_MAC_OSX ? TRAY_ICON_MAC : TRAY_ICON)) { trayMenu.showTrayIcon(image.readAllBytes(), this::showMainWindow, "Cryptomator"); + trayMenu.onBeforeOpenMenu(() -> { + for (Vault vault : vaults) { + VaultListManager.redetermineVaultState(vault); + } + }); rebuildMenu(); initialized = true; } catch (IOException e) {