From 275dd06adf2726ba3d7e5ac513c91f4a15ff8ae0 Mon Sep 17 00:00:00 2001 From: Daltz333 Date: Tue, 8 Sep 2020 12:10:13 -0400 Subject: [PATCH 01/14] Replace Azure with Actions --- .github/workflows/ci.yml | 85 ++++++++++++++++++++++++ azure-pipelines.yml | 137 --------------------------------------- 2 files changed, 85 insertions(+), 137 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 azure-pipelines.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..b588d39f --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,85 @@ +name: CI + +on: [pull_request, push] + +jobs: + windows-32: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: 5.0.100-preview.8.20417.9 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Build Installer + uses: eskatos/gradle-command-action@v1 + with: + gradle-version: 6.0.1 + arguments: generateInstallers -PXmx3072m -Pwindows32 -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild + - name: Archive Artifacts + uses: actions/upload-artifact@v2 + with: + name: win32-installer + path: build\outputs\ + windows-64: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: 5.0.100-preview.8.20417.9 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Build Installer + uses: eskatos/gradle-command-action@v1 + with: + gradle-version: 6.0.1 + arguments: generateInstallers -PXmx3072m -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild + - name: Archive Artifacts + uses: actions/upload-artifact@v2 + with: + name: win64-installer + path: build\outputs\ + linux: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: 5.0.100-preview.8.20417.9 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Build Installer + uses: eskatos/gradle-command-action@v1 + with: + gradle-version: 6.0.1 + arguments: generateInstallers -PXmx3072m -PlinuxBuild -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild + - name: Archive Artifacts + uses: actions/upload-artifact@v2 + with: + name: linux-installer + path: build\outputs\ + mac-os: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: 5.0.100-preview.8.20417.9 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Build Installer + uses: eskatos/gradle-command-action@v1 + with: + gradle-version: 6.0.1 + arguments: generateInstallers -PXmx3072m -PmacBuild -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild + - name: Archive Artifacts + uses: actions/upload-artifact@v2 + with: + name: macos-installer + path: build\outputs\ diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index bbcbbfbd..00000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,137 +0,0 @@ -# Gradle -# Build your Java project and run tests with Gradle using a Gradle wrapper script. -# Add steps that analyze code, save build artifacts, deploy, and more: -# https://docs.microsoft.com/azure/devops/pipelines/languages/java - -jobs: - - job: Windows_32_Bit - pool: - vmImage: 'windows-2019' - timeoutInMinutes: 0 - - steps: - - task: UseDotNet@2 - displayName: 'Use .NET Core sdk' - inputs: - packageType: sdk - version: 5.x - includePreviewVersions: true - installationPath: $(Agent.ToolsDirectory)/dotnet - - task: Gradle@2 - inputs: - workingDirectory: '' - gradleWrapperFile: 'gradlew' - gradleOptions: '-Xmx3072m' - jdkVersionOption: '1.11' - publishJUnitResults: false - testResultsFiles: '**/TEST-*.xml' - tasks: 'generateInstallers' - options: '-Pwindows32 -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild' - - - task: CopyFiles@2 - inputs: - contents: 'build\outputs\**' - targetFolder: $(Build.ArtifactStagingDirectory) - - - task: PublishBuildArtifacts@1 - inputs: - artifactName: 'Win32' - - - job: Windows_64_Bit - pool: - vmImage: 'windows-2019' - timeoutInMinutes: 0 - - steps: - - task: UseDotNet@2 - displayName: 'Use .NET Core sdk' - inputs: - packageType: sdk - version: 5.x - includePreviewVersions: true - installationPath: $(Agent.ToolsDirectory)/dotnet - - task: Gradle@2 - inputs: - workingDirectory: '' - gradleWrapperFile: 'gradlew' - gradleOptions: '-Xmx3072m' - jdkVersionOption: '1.11' - publishJUnitResults: false - testResultsFiles: '**/TEST-*.xml' - tasks: 'generateInstallers' - options: '-DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild' - - - task: CopyFiles@2 - inputs: - contents: 'build\outputs\**' - targetFolder: $(Build.ArtifactStagingDirectory) - - - task: PublishBuildArtifacts@1 - inputs: - artifactName: 'Win64' - - - job: Mac - pool: - vmImage: 'macOS-10.14' - timeoutInMinutes: 0 - - steps: - - task: UseDotNet@2 - displayName: 'Use .NET Core sdk' - inputs: - packageType: sdk - version: 5.x - includePreviewVersions: true - installationPath: $(Agent.ToolsDirectory)/dotnet - - task: Gradle@2 - inputs: - workingDirectory: '' - gradleWrapperFile: 'gradlew' - gradleOptions: '-Xmx3072m' - jdkVersionOption: '1.11' - publishJUnitResults: false - testResultsFiles: '**/TEST-*.xml' - tasks: 'generateInstallers' - options: '-PmacBuild -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild' - - - task: CopyFiles@2 - inputs: - contents: 'build/outputs/**' - targetFolder: $(Build.ArtifactStagingDirectory) - - - task: PublishBuildArtifacts@1 - inputs: - artifactName: 'Mac' - - - job: Linux - pool: - vmImage: 'ubuntu-18.04' - timeoutInMinutes: 0 - - steps: - - task: UseDotNet@2 - displayName: 'Use .NET Core sdk' - inputs: - packageType: sdk - version: 5.x - includePreviewVersions: true - installationPath: $(Agent.ToolsDirectory)/dotnet - - task: Gradle@2 - inputs: - workingDirectory: '' - gradleWrapperFile: 'gradlew' - gradleOptions: '-Xmx3072m' - jdkVersionOption: 1.11 - publishJUnitResults: false - testResultsFiles: '**/TEST-*.xml' - tasks: 'generateInstallers' - options: '-PlinuxBuild -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild' - - - task: CopyFiles@2 - inputs: - contents: 'build/outputs/**' - targetFolder: $(Build.ArtifactStagingDirectory) - - - task: PublishBuildArtifacts@1 - inputs: - artifactName: 'Linux' From 39f064de7c268c63efa341d4a250311df3656427 Mon Sep 17 00:00:00 2001 From: Daltz333 Date: Tue, 8 Sep 2020 12:11:33 -0400 Subject: [PATCH 02/14] More consistent naming --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b588d39f..c8dc4a8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: with: name: linux-installer path: build\outputs\ - mac-os: + macos: runs-on: macos-latest steps: - uses: actions/checkout@v2 From 1e18da66ba3bc774a3234872957f350ab5df69d4 Mon Sep 17 00:00:00 2001 From: Daltz333 Date: Tue, 8 Sep 2020 12:32:35 -0400 Subject: [PATCH 03/14] Use matrix instead --- .github/workflows/ci.yml | 90 ++++++++++++---------------------------- 1 file changed, 26 insertions(+), 64 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8dc4a8a..17c06f89 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,29 @@ name: CI on: [pull_request, push] jobs: - windows-32: - runs-on: windows-latest + build: + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-latest + artifact-name: Linux + architecture: x64 + build-options: "-PlinuxBuild" + - os: windows-latest + artifact-name: Win64 + architecture: x64 + build-options: "" + - os: windows-latest + artifact-name: Win32 + architecture: x86 + build-options: "-Pwindows32" + - os: macos-latest + artifact-name: MacOS + architecture: x64 + build-options: "-PmacBuild" + name: "Build - ${{ matrix.artifact-name }}" + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 @@ -17,69 +38,10 @@ jobs: uses: eskatos/gradle-command-action@v1 with: gradle-version: 6.0.1 - arguments: generateInstallers -PXmx3072m -Pwindows32 -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild + arguments: generateInstallers -PXmx3072m ${{ matrix.build-options }} -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild - name: Archive Artifacts uses: actions/upload-artifact@v2 with: - name: win32-installer - path: build\outputs\ - windows-64: - runs-on: windows-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 5.0.100-preview.8.20417.9 - - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Build Installer - uses: eskatos/gradle-command-action@v1 - with: - gradle-version: 6.0.1 - arguments: generateInstallers -PXmx3072m -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild - - name: Archive Artifacts - uses: actions/upload-artifact@v2 - with: - name: win64-installer - path: build\outputs\ - linux: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 5.0.100-preview.8.20417.9 - - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Build Installer - uses: eskatos/gradle-command-action@v1 - with: - gradle-version: 6.0.1 - arguments: generateInstallers -PXmx3072m -PlinuxBuild -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild - - name: Archive Artifacts - uses: actions/upload-artifact@v2 - with: - name: linux-installer - path: build\outputs\ - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 5.0.100-preview.8.20417.9 - - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Build Installer - uses: eskatos/gradle-command-action@v1 - with: - gradle-version: 6.0.1 - arguments: generateInstallers -PXmx3072m -PmacBuild -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild - - name: Archive Artifacts - uses: actions/upload-artifact@v2 - with: - name: macos-installer + name: ${{ matrix.artifact-name }}-installer path: build\outputs\ + \ No newline at end of file From ab7691c9c803a8bda95a641bdb1bee8c36fe07f4 Mon Sep 17 00:00:00 2001 From: Daltz333 Date: Tue, 8 Sep 2020 12:33:24 -0400 Subject: [PATCH 04/14] Fix indentation --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17c06f89..bb212194 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: artifact-name: MacOS architecture: x64 build-options: "-PmacBuild" - name: "Build - ${{ matrix.artifact-name }}" + name: "Build - ${{ matrix.artifact-name }}" runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 From 206df8ca305ae98f359e61a101e8767885b2de9d Mon Sep 17 00:00:00 2001 From: Daltz333 Date: Tue, 8 Sep 2020 12:34:12 -0400 Subject: [PATCH 05/14] Fix more indentation --- .github/workflows/ci.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb212194..4b4db700 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,24 +24,24 @@ jobs: artifact-name: MacOS architecture: x64 build-options: "-PmacBuild" - name: "Build - ${{ matrix.artifact-name }}" - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 5.0.100-preview.8.20417.9 - - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Build Installer - uses: eskatos/gradle-command-action@v1 - with: - gradle-version: 6.0.1 - arguments: generateInstallers -PXmx3072m ${{ matrix.build-options }} -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild - - name: Archive Artifacts - uses: actions/upload-artifact@v2 - with: - name: ${{ matrix.artifact-name }}-installer - path: build\outputs\ + name: "Build - ${{ matrix.artifact-name }}" + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: 5.0.100-preview.8.20417.9 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Build Installer + uses: eskatos/gradle-command-action@v1 + with: + gradle-version: 6.0.1 + arguments: generateInstallers -PXmx3072m ${{ matrix.build-options }} -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild + - name: Archive Artifacts + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.artifact-name }}-installer + path: build\outputs\ \ No newline at end of file From d777da543ac0e2cea66afee4e1a1714f6dcc0664 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Tue, 8 Sep 2020 15:24:10 -0400 Subject: [PATCH 06/14] Address comments --- .github/workflows/ci.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b4db700..35790509 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,19 +10,15 @@ jobs: include: - os: ubuntu-latest artifact-name: Linux - architecture: x64 build-options: "-PlinuxBuild" - os: windows-latest artifact-name: Win64 - architecture: x64 build-options: "" - os: windows-latest artifact-name: Win32 - architecture: x86 build-options: "-Pwindows32" - os: macos-latest artifact-name: MacOS - architecture: x64 build-options: "-PmacBuild" name: "Build - ${{ matrix.artifact-name }}" runs-on: ${{ matrix.os }} @@ -30,18 +26,13 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.100-preview.8.20417.9 + dotnet-version: 5.0.x - uses: actions/setup-java@v1 with: java-version: 11 - name: Build Installer - uses: eskatos/gradle-command-action@v1 + run: ./gradlew generateInstallers -PXmx3072m ${{ matrix.build-options }} -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild + - uses: actions/upload-artifact@v2 with: - gradle-version: 6.0.1 - arguments: generateInstallers -PXmx3072m ${{ matrix.build-options }} -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild - - name: Archive Artifacts - uses: actions/upload-artifact@v2 - with: - name: ${{ matrix.artifact-name }}-installer - path: build\outputs\ - \ No newline at end of file + name: ${{ matrix.artifact-name }} + path: build/outputs/ From f5a54944d2f4ca53d57c1a6ba25f0d2a2ad2341d Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Tue, 8 Sep 2020 15:25:36 -0400 Subject: [PATCH 07/14] Put build options last so they override defaults --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35790509..00497583 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: with: java-version: 11 - name: Build Installer - run: ./gradlew generateInstallers -PXmx3072m ${{ matrix.build-options }} -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild + run: ./gradlew generateInstallers -PXmx3072m -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild ${{ matrix.build-options }} - uses: actions/upload-artifact@v2 with: name: ${{ matrix.artifact-name }} From 8e1745cb2bbd454198621f819520093ce33c8981 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Tue, 8 Sep 2020 15:27:25 -0400 Subject: [PATCH 08/14] Fix wildcard dotnet --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00497583..f31db0ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.x + dotnet-version: 5.0.100-preview.8.20417.9 - uses: actions/setup-java@v1 with: java-version: 11 From c1d1f589a42afab45d1f29b62213327c8386f195 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Tue, 8 Sep 2020 15:42:03 -0400 Subject: [PATCH 09/14] Use correct gradle property names --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f31db0ba..760a9b68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: with: java-version: 11 - name: Build Installer - run: ./gradlew generateInstallers -PXmx3072m -DsystemProp.org.gradle.internal.http.connectionTimeout=180000 -DsystemProp.org.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild ${{ matrix.build-options }} + run: ./gradlew generateInstallers -PXmx3072m -Dorg.gradle.internal.http.connectionTimeout=180000 -Dorg.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild ${{ matrix.build-options }} - uses: actions/upload-artifact@v2 with: name: ${{ matrix.artifact-name }} From d4e2b3d4c1cffc3ed8c9a94e347cb58866ce29a1 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Tue, 8 Sep 2020 15:46:13 -0400 Subject: [PATCH 10/14] Use bash on all platforms --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 760a9b68..a7451b76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,7 @@ jobs: with: java-version: 11 - name: Build Installer + shell: bash run: ./gradlew generateInstallers -PXmx3072m -Dorg.gradle.internal.http.connectionTimeout=180000 -Dorg.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild ${{ matrix.build-options }} - uses: actions/upload-artifact@v2 with: From 6b3e72752b28bd870415a684dedc2a2daa4fefb8 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Wed, 9 Sep 2020 10:52:01 -0400 Subject: [PATCH 11/14] Disable HTTP wagon --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7451b76..374e68b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: java-version: 11 - name: Build Installer shell: bash - run: ./gradlew generateInstallers -PXmx3072m -Dorg.gradle.internal.http.connectionTimeout=180000 -Dorg.gradle.internal.http.socketTimeout=180000 -PjenkinsBuild ${{ matrix.build-options }} + run: ./gradlew generateInstallers -Dmaven.wagon.http.pool=false -PjenkinsBuild ${{ matrix.build-options }} - uses: actions/upload-artifact@v2 with: name: ${{ matrix.artifact-name }} From 79e12b1324bfd7ea4def0f114f5692eaa4e2dd47 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Wed, 9 Sep 2020 11:19:23 -0400 Subject: [PATCH 12/14] Diable keepalive on windows --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 374e68b0..2cb4f5c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,10 @@ jobs: build-options: "-PlinuxBuild" - os: windows-latest artifact-name: Win64 - build-options: "" + build-options: "-Dhttp.keepAlive=false" - os: windows-latest artifact-name: Win32 - build-options: "-Pwindows32" + build-options: "-Pwindows32 -Dhttp.keepAlive=false" - os: macos-latest artifact-name: MacOS build-options: "-PmacBuild" @@ -32,7 +32,7 @@ jobs: java-version: 11 - name: Build Installer shell: bash - run: ./gradlew generateInstallers -Dmaven.wagon.http.pool=false -PjenkinsBuild ${{ matrix.build-options }} + run: ./gradlew generateInstallers -PjenkinsBuild ${{ matrix.build-options }} - uses: actions/upload-artifact@v2 with: name: ${{ matrix.artifact-name }} From bcaedabebfc7073ea1568bb69e039f1278ca6eec Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Wed, 9 Sep 2020 20:38:22 -0400 Subject: [PATCH 13/14] Remove all flags --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2cb4f5c8..fac66d87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,10 @@ jobs: build-options: "-PlinuxBuild" - os: windows-latest artifact-name: Win64 - build-options: "-Dhttp.keepAlive=false" + build-options: "" - os: windows-latest artifact-name: Win32 - build-options: "-Pwindows32 -Dhttp.keepAlive=false" + build-options: "-Pwindows32" - os: macos-latest artifact-name: MacOS build-options: "-PmacBuild" From 4d861b5dce73088ac258b29b8eecf19d86378cd8 Mon Sep 17 00:00:00 2001 From: Austin Shalit Date: Thu, 22 Oct 2020 22:32:50 -0400 Subject: [PATCH 14/14] Rename mac upload to macOS --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8390ff1a..e2d2f411 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -113,5 +113,5 @@ jobs: - name: Upload Installer DMG uses: actions/upload-artifact@v2 with: - name: wpilib-installer + name: macOS path: build/WPILibInstaller.dmg