diff --git a/.crowdin.yml b/.crowdin.yml index 719c29826..a70a3975b 100644 --- a/.crowdin.yml +++ b/.crowdin.yml @@ -1,5 +1,5 @@ commit_message: "[ci skip]" escape_special_characters: 0 files: - - source: /main/ui/src/main/resources/i18n/strings.properties - translation: /main/ui/src/main/resources/i18n/strings_%two_letters_code%.properties + - source: /src/main/resources/i18n/strings.properties + translation: /src/main/resources/i18n/strings_%two_letters_code%.properties diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a464f599..3cf0cb845 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,41 +20,38 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Ensure to use tagged version - run: mvn versions:set --file main/pom.xml -DnewVersion=${GITHUB_REF##*/} # use shell parameter expansion to strip of 'refs/tags' + run: mvn versions:set -DnewVersion=${GITHUB_REF##*/} # use shell parameter expansion to strip of 'refs/tags' if: startsWith(github.ref, 'refs/tags/') - name: Build and Test - run: mvn -B install --file main/pom.xml -Pcoverage - - name: Run Codacy Coverage Reporter - if: github.repository == 'cryptomator/cryptomator' - run: | - curl -o ~/codacy-coverage-reporter.jar https://repo.maven.apache.org/maven2/com/codacy/codacy-coverage-reporter/7.1.0/codacy-coverage-reporter-7.1.0-assembly.jar - $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial - $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial - $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar report -l Java -r main/launcher/target/site/jacoco/jacoco.xml --partial - $JAVA_HOME/bin/java --illegal-access=permit -jar ~/codacy-coverage-reporter.jar final + run: mvn -B clean install jacoco:report -Pcoverage,dependency-check + - name: Upload code coverage report + id: codacyCoverageReporter + run: bash <(curl -Ls https://coverage.codacy.com/get.sh) env: CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} + continue-on-error: true +### TODO: move to matrix build: - name: Assemble buildkit-linux.zip - run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,linux + run: mvn -B clean package -DskipTests -Plinux - name: Upload buildkit-linux.zip uses: actions/upload-artifact@v1 with: name: buildkit-linux.zip - path: main/buildkit/target/buildkit-linux.zip + path: target/buildkit-linux.zip - name: Assemble buildkit-mac.zip - run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,mac + run: mvn -B clean package -DskipTests -Pmac - name: Upload buildkit-mac.zip uses: actions/upload-artifact@v1 with: name: buildkit-mac.zip - path: main/buildkit/target/buildkit-mac.zip + path: target/buildkit-mac.zip - name: Assemble buildkit-win.zip - run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,windows + run: mvn -B clean package -DskipTests -Pwindows - name: Upload buildkit-win.zip uses: actions/upload-artifact@v1 with: name: buildkit-win.zip - path: main/buildkit/target/buildkit-win.zip + path: target/buildkit-win.zip release: name: Draft a Release on GitHub Releases diff --git a/.idea/misc.xml b/.idea/misc.xml index feca1b9ff..68ef79a67 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 2e793ed5c..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Cryptomator_Linux.xml b/.idea/runConfigurations/Cryptomator_Linux.xml index 01c00da09..242dc0c56 100644 --- a/.idea/runConfigurations/Cryptomator_Linux.xml +++ b/.idea/runConfigurations/Cryptomator_Linux.xml @@ -1,7 +1,7 @@