diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13f56a7..0b8162d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,12 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - - name: Set up JDK - uses: joschi/setup-jdk@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: openjdk14 + distribution: 'zulu' + java-version: '11' + java-package: jre #+fx - name: Fetch Conduktor sources run: | git clone --single-branch --branch ${{ github.event.client_payload.tag }} --depth 1 https://osef:${{secrets.GH_BUILD_TOKEN}}@github.com/conduktor/conduktor-desktop.git @@ -72,10 +74,12 @@ jobs: runs-on: windows-2019 steps: - uses: actions/checkout@v2 - - name: Set up JDK - uses: joschi/setup-jdk@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: openjdk14 + distribution: 'zulu' + java-version: '11' + java-package: jre #+fx - name: Fetch Conduktor sources run: | git clone --single-branch --branch ${{ github.event.client_payload.tag }} --depth 1 https://osef:${{secrets.GH_BUILD_TOKEN}}@github.com/conduktor/conduktor-desktop.git @@ -126,10 +130,12 @@ jobs: runs-on: macos-10.15 steps: - uses: actions/checkout@v2 - - name: Set up JDK - uses: joschi/setup-jdk@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: openjdk14 + distribution: 'zulu' + java-version: '11' + java-package: jre #+fx - name: Fetch Conduktor sources run: | git clone --single-branch --branch ${{ github.event.client_payload.tag }} --depth 1 https://osef:${{secrets.GH_BUILD_TOKEN}}@github.com/conduktor/conduktor-desktop.git @@ -183,9 +189,12 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: joschi/setup-jdk@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: openjdk14 + distribution: 'zulu' + java-version: '11' + java-package: jre #+fx - name: Download built distribution uses: actions/download-artifact@v1 @@ -222,9 +231,12 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: joschi/setup-jdk@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: openjdk14 + distribution: 'zulu' + java-version: '11' + java-package: jre #+fx - name: Download built distribution uses: actions/download-artifact@v1 @@ -256,9 +268,12 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: joschi/setup-jdk@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: openjdk14 + distribution: 'zulu' + java-version: '11' + java-package: jre #+fx - name: Download built distribution uses: actions/download-artifact@v1 diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index 494dab8..0cd55e1 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -19,10 +19,12 @@ jobs: runs-on: macos-10.15 steps: - uses: actions/checkout@v2 - - name: Set up JDK - uses: joschi/setup-jdk@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: openjdk14 + distribution: 'zulu' + java-version: '11' + java-package: jre #+fx - name: Fetch Conduktor sources run: | git clone --single-branch --branch ${{ github.event.client_payload.tag }} --depth 1 https://osef:${{secrets.GH_BUILD_TOKEN}}@github.com/conduktor/conduktor-desktop.git @@ -76,9 +78,12 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: joschi/setup-jdk@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: openjdk14 + distribution: 'zulu' + java-version: '11' + java-package: jre #+fx - name: Download built distribution uses: actions/download-artifact@v1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c7ba53a --- /dev/null +++ b/.gitignore @@ -0,0 +1,161 @@ +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff + +# Generated files + +# Sensitive or high-churn files + +# Gradle + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake + +# Mongo Explorer plugin + +# File-based project format + +# IntelliJ + +# mpeltonen/sbt-idea plugin + +# JIRA plugin + +# Cursive Clojure plugin + +# Crashlytics plugin (for Android Studio and IntelliJ) + +# Editor-based Rest Client + +# Android studio 3.1+ serialized cache file + +### Linux template +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS template +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk +