Merge remote-tracking branch 'origin/circleci-editor/122/circleci-pro…

…ject-setup' into circleci-editor/122/circleci-project-setup
Ultreon · Oct 22, 2023 · dadc602 · dadc602
2 parents 8716855 + 11142e6
commit dadc602
Showing 1 changed file with 27 additions and 97 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,137 +8,70 @@ jobs:
   build-windows:
     machine:
       image: 'windows-server-2022-gui:current'
-      resource_class: windows.medium
+      resource_class: windows.large
       shell: powershell.exe -ExecutionPolicy Bypass
+    description: "Build Windows EXE and MSI installers"
     # Add steps to the job
     # See: https://circleci.com/docs/2.0/configuration-reference/#steps
     steps:
       - checkout
       - run:
-          name: Set up JDK 17
+          name: Set up WiX Toolset
           command: |
-            choco install openjdk --version=17.0 --allow-downgrade --params '/64 /m' -y
-            Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
-            refreshenv
+            choco install wixtoolset --params '/64 /m' -y
       - run:
-            name: "Build Project"
-            command: ".\\gradlew-ci.bat jpackage --info"
-            environment:
-              CIRCLE_CI: "true"
-      - store_artifacts:
-          name: "Store Artifacts"
-          path: desktop-merge/build/dist
-
-  build-windows-alt:
-    # Specify the execution environment. You can specify an image from Dockerhub, or use one of our Convenience Images from CircleCI's Developer Hub.
-    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
-    machine:
-      image: 'windows-server-2022-gui:current'
-      resource_class: windows.medium
-      shell: powershell.exe -ExecutionPolicy Bypass
-    # Add steps to the job
-    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
-    steps:
-      - checkout
-      - run:
-          name: Set up JDK 17
+          name: "Build Project"
           command: |
-            choco install openjdk --version=17.0 --allow-downgrade --params '/64 /m' -y
-            Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
-            refreshenv
-      - run:
-            name: "Build Project"
-            command: ".\\gradlew-ci.bat jpackageAlt --info"
-            environment:
-              CIRCLE_CI: "true"
+            ./gradlew.bat jpackage jpackageAlt --no-daemon
+          environment:
+            CIRCLE_CI: "true"
       - store_artifacts:
-          name: "Store Alternate Artifacts"
+          name: "Store Artifacts"
           path: desktop-merge/build/dist
 
   build-macos:
     macos:
       xcode: "14.2.0"
+    description: "Build macOS PKG installers and DMG file"
     # Add steps to the job
     # See: https://circleci.com/docs/2.0/configuration-reference/#steps
     steps:
       - checkout
       - run:
-            name: "Make gradlew executable"
-            command: "chmod +x gradlew"
+          name: "Make gradlew executable"
+          command: "chmod +x gradlew"
       - run:
-            name: "Build Project"
-            command: "./gradlew jpackage --info"
-            environment:
-              CIRCLE_CI: "true"
+          name: "Build Project"
+          command: |
+            ./gradlew jpackage jpackageAlt --no-daemon
+          environment:
+            CIRCLE_CI: "true"
       - store_artifacts:
           name: "Store Artifacts"
           path: desktop-merge/build/dist
 
-  build-macos-alt:
-    # Specify the execution environment. You can specify an image from Dockerhub, or use one of our Convenience Images from CircleCI's Developer Hub.
-    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
-    macos:
-      xcode: "14.2.0"
-    # Add steps to the job
-    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
-    steps:
-      - checkout
-      - run:
-            name: "Make gradlew executable"
-            command: "chmod +x gradlew"
-      - run:
-            name: "Build Project"
-            command: "./gradlew jpackageAlt"
-            environment:
-              CIRCLE_CI: "true"
-      - store_artifacts:
-          name: "Store Alternate Artifacts"
-          path: desktop-merge/build/dist
-
   build-linux:
     # Specify the execution environment. You can specify an image from Dockerhub, or use one of our Convenience Images from CircleCI's Developer Hub.
     # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
     docker:
       - image: gradle:jdk17
+    description: "Build Linux DEB package"
     # Add steps to the job
     # See: https://circleci.com/docs/2.0/configuration-reference/#steps
     steps:
       - checkout
       - run:
-            name: "Make gradlew executable"
-            command: "chmod +x gradlew"
+          name: "Make gradlew executable"
+          command: "chmod +x gradlew"
       - run:
-            name: "Install APT Packages"
-            command: "apt update -y && apt install fakeroot -y"
+          name: "Install APT Packages"
+          command: "apt update -y && apt install fakeroot -y"
       - run:
-            name: "Build Project"
-            command: "./gradlew jpackage --info"
-            environment:
-              CIRCLE_CI: "true"
-      - store_artifacts:
-          name: "Store Artifacts"
-          path: desktop-merge/build/dist
-
-  build-linux-alt:
-    # Specify the execution environment. You can specify an image from Dockerhub, or use one of our Convenience Images from CircleCI's Developer Hub.
-    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
-    docker:
-      - image: gradle:jdk17
-    # Add steps to the job
-    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
-    steps:
-      - checkout
-      - run:
-            name: "Make gradlew executable"
-            command: "chmod +x gradlew"
-      - run:
-            name: "Install APT Packages"
-            command: "apt update -y && apt install fakeroot -y"
-      - run:
-            name: "Build Project"
-            command: "./gradlew jpackage --info"
-            environment:
-              CIRCLE_CI: "true"
+          name: "Build Project"
+          command: |
+            ./gradlew jpackage --no-daemon
+          environment:
+            CIRCLE_CI: "true"
       - store_artifacts:
           name: "Store Artifacts"
           path: desktop-merge/build/dist
@@ -149,8 +82,5 @@ workflows:
   build-workflow:
     jobs:
       - build-windows
-      - build-windows-alt
       - build-macos
-      - build-macos-alt
       - build-linux
-      - build-linux-alt