Browse Source

Merge branch 'feature/gh-actions' into develop

Sebastian Stenzel 5 years ago
parent
commit
3ec2d4b701
5 changed files with 67 additions and 100 deletions
  1. 66 0
      .github/workflows/build.yml
  2. 0 19
      .travis-deploy-release.tmpl.json
  3. 0 15
      .travis-deploy-snapshot.json
  4. 0 65
      .travis.yml
  5. 1 1
      main/pom.xml

+ 66 - 0
.github/workflows/build.yml

@@ -0,0 +1,66 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build
+
+on:
+  [push]
+
+jobs: 
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 14
+        uses: actions/setup-java@v1
+        with:
+          java-version: 14
+      - uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: mvn -B install --file main/pom.xml -Pcoverage
+      - name: Run Codacy Coverage Reporter
+        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 -jar ~/codacy-coverage-reporter.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial
+          $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/keychain/target/site/jacoco/jacoco.xml --partial
+          $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial
+          $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/launcher/target/site/jacoco/jacoco.xml --partial
+          $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar final
+        env:
+          CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          
+  assemble-build-kit:
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 14
+        uses: actions/setup-java@v1
+        with:
+          java-version: 14
+      - uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ github.run_id }}
+      - name: Build with Maven
+        run: mvn -B package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease
+      - name: Upload buildkit-linux.zip
+        uses: actions/upload-artifact@v1
+        with:
+          name: buildkit-linux.zip
+          path: main/buildkit/target/buildkit-linux.zip
+      - name: Upload buildkit-mac.zip
+        uses: actions/upload-artifact@v1
+        with:
+          name: buildkit-mac.zip
+          path: main/buildkit/target/buildkit-mac.zip
+      - name: Upload buildkit-win.zip
+        uses: actions/upload-artifact@v1
+        with:
+          name: buildkit-win.zip
+          path: main/buildkit/target/buildkit-win.zip

+ 0 - 19
.travis-deploy-release.tmpl.json

@@ -1,19 +0,0 @@
-{
-  "package": {
-	"name": "buildkit",
-	"repo": "cryptomator",
-	"subject": "cryptomator"
-  },
-  "version": {
-	"name": "$TRAVIS_TAG",
-	"desc": "Cryptomator version $TRAVIS_TAG",
-	"released": "$TODAY",
-	"vcs_tag": "$TRAVIS_TAG",
-	"gpgSign": true
-  },
-  "files":
-  [
-	{"includePattern": "main/buildkit/target/(buildkit-[a-z]+\\.zip)", "uploadPattern": "/$TRAVIS_TAG/$1"}
-  ],
-  "publish": true
-}

+ 0 - 15
.travis-deploy-snapshot.json

@@ -1,15 +0,0 @@
-{
-  "package": {
-	"name": "buildkit",
-	"repo": "cryptomator",
-	"subject": "cryptomator"
-  },
-  "version": {
-	"name": "snapshot"
-  },
-  "files":
-  [
-	{"includePattern": "main/buildkit/target/(buildkit-[a-z]+\\.zip)", "uploadPattern": "/snapshot/$1", "matrixParams": {"override": 1}}
-  ],
-  "publish": true
-}

+ 0 - 65
.travis.yml

@@ -1,65 +0,0 @@
-dist: bionic
-language: java
-sudo: false
-jdk:
-- openjdk11
-cache:
-  directories:
-  - $HOME/.m2
-env:
-  global:
-    - secure: "HftEaabMmWn5GwKFKksUkOcelc3Mn7xazwAEy+4d4gL1+F8VhID/6DCK7nas+afUymWnxTano8Rv4Ci5MWryNkNkTH+FUPWmF3xWezc3hajSyS7RB92IZ8VPetl4Fo8UI1WwM5apDEaugalPxkIf8a7N+lpG5X/Gpumwzo3Be3w=" # BINTRAY_API_KEY
-    - secure: "oWFgRTVP6lyTa7qVxlvkpm20MtVc3BtmsNXQJS6bfg2A0o/iCQMNx7OD59BaafCLGRKvCcJVESiC8FlSylVMS7CDSyYu0gg70NUiIuHp4NBM5inFWYCy/PdQsCTzr5uvNG+rMFQpMFRaCV0FrfM3tLondcVkhsHL68l93Xoexx4=" # CODACY_PROJECT_TOKEN
-    - secure: "zJxgytA2Ks5Xzv+7kUaUq+EBFNQw9Qec63lcMJVuXVWczjL16nKW1EzzV515ag+OWL46z3lEPForDhufw0VtFnNmaX68jkO0mp01eLrHApc1llN2Y/U8GBXfNNazN4+Kom4H+z/AO+wJr8EsKMMUczCdQ3APgd9uVI0hzXw/Z3M=" # GITHUB_API_KEY
-addons:
-  apt:
-    packages:
-    - haveged
-install:
-# - curl -o $HOME/.m2/settings.xml https://gist.githubusercontent.com/cryptobot/cf5fbd909c4782aaeeeb7c7f4a1a43da/raw/e60ee486e34ee0c79f89f947abe2c83b4290c6bb/settings.xml
-- mvn -fmain/pom.xml clean install -DskipTests -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN org.codehaus.mojo:versions-maven-plugin:help dependency:go-offline -Pcoverage,release # "clean install" needed until we can exclude artifacts currently in the reactor, see https://maven.apache.org/plugins/maven-dependency-plugin/go-offline-mojo.html#excludeReactor and https://issues.apache.org/jira/browse/MDEP-568
-before_script:
-- |
-  if [[ -n "$TRAVIS_TAG" ]]; then
-    mvn -fmain/pom.xml org.codehaus.mojo:versions-maven-plugin:set -DnewVersion=$TRAVIS_TAG
-  else
-    mvn -fmain/pom.xml org.codehaus.mojo:versions-maven-plugin:set -DnewVersion=SNAPSHOT-$(echo $TRAVIS_COMMIT | head -c7)
-  fi
-script:
-- mvn --update-snapshots -fmain/pom.xml clean test verify -Pcoverage
-after_success:
-- 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 -jar ~/codacy-coverage-reporter.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial
-- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/keychain/target/site/jacoco/jacoco.xml --partial
-- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial
-- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/launcher/target/site/jacoco/jacoco.xml --partial
-- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar final
-before_deploy:
-- mvn -fmain/pom.xml package -Prelease -DskipTests
-- export TODAY=`date +'%Y-%m-%d'`; envsubst '$TRAVIS_TAG $TODAY' < .travis-deploy-release.tmpl.json > .travis-deploy-release.json
-deploy:
-- provider: bintray # SNAPSHOTS
-  file: .travis-deploy-snapshot.json
-  user: cryptobot
-  key: $BINTRAY_API_KEY
-  skip_cleanup: true
-  on:
-    repo: cryptomator/cryptomator
-    branch: develop
-- provider: bintray # RELEASES
-  file: .travis-deploy-release.json
-  user: cryptobot
-  key: $BINTRAY_API_KEY
-  skip_cleanup: true
-  on:
-    repo: cryptomator/cryptomator
-    tags: true
-- provider: releases
-  api_key: $GITHUB_API_KEY
-  file_glob: true
-  file:
-    - "main/buildkit/target/buildkit-*.zip"
-  skip_cleanup: true
-  on:
-    repo: cryptomator/cryptomator
-    tags: true

+ 1 - 1
main/pom.xml

@@ -331,7 +331,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
 				<configuration>
-					<release>11</release>
+					<release>14</release>
 					<annotationProcessorPaths>
 						<path>
 							<groupId>com.google.dagger</groupId>