From b724f7c1fb053d9af8dc7d125614e0a50cc215b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 00:59:03 +0000 Subject: [PATCH 1/9] chore(maven): bump org.openjfx:javafx-graphics from 21.0.1 to 21.0.2 Bumps org.openjfx:javafx-graphics from 21.0.1 to 21.0.2. --- updated-dependencies: - dependency-name: org.openjfx:javafx-graphics dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 634abb621..37d6862de 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.openjfx javafx-graphics - 21.0.1 + 21.0.2 From f7f4a7d571e8fa87b6f27ca67cea8dd74c575684 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Wed, 17 Jan 2024 13:26:17 +0530 Subject: [PATCH 2/9] fix: Added msbuild for windows build --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f66159e8..966515bf8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ on: type: boolean concurrency: - group: ${{ github.event.pull_request.number || github.ref }} + group: ${{ github.ref }} cancel-in-progress: true jobs: @@ -35,6 +35,8 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.3.1 - name: Update system packages if: ${{ matrix.os == 'ubuntu-latest' && matrix.mode == 'GUI' }} run: sudo apt-get update From f9acf8c5a8d8d80a34a2f96fc5b43bcda04f1835 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Wed, 17 Jan 2024 13:30:56 +0530 Subject: [PATCH 3/9] Update build.yml --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 966515bf8..0322a8082 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,8 +35,6 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.3.1 - name: Update system packages if: ${{ matrix.os == 'ubuntu-latest' && matrix.mode == 'GUI' }} run: sudo apt-get update From abdcb19421f48f62d0790a04e4a912664b9b1409 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Wed, 17 Jan 2024 13:32:56 +0530 Subject: [PATCH 4/9] Update pom.xml --- GUI/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/GUI/pom.xml b/GUI/pom.xml index 446e8e059..c73587766 100644 --- a/GUI/pom.xml +++ b/GUI/pom.xml @@ -103,9 +103,8 @@ build-drifty-gui-for-windows-latest msi - ${pom.parent.basedir}/config/missing_symbols-windows-latest.o resource-config-windows.json - \ No newline at end of file + From 3cc3a8ead28b8b6702d054de2fc257788f654911 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Wed, 17 Jan 2024 13:53:49 +0530 Subject: [PATCH 5/9] Update pom.xml --- GUI/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/GUI/pom.xml b/GUI/pom.xml index c73587766..13f7872b8 100644 --- a/GUI/pom.xml +++ b/GUI/pom.xml @@ -103,6 +103,7 @@ build-drifty-gui-for-windows-latest msi + ${pom.parent.basedir}/config/missing_symbols-windows-latest.o resource-config-windows.json From 4685ae9d409829b48e133fa207ff6f536bb5f04c Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Wed, 17 Jan 2024 13:55:35 +0530 Subject: [PATCH 6/9] Update missing_symbols.c --- config/missing_symbols.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/missing_symbols.c b/config/missing_symbols.c index e3054d300..f7c91ebf0 100644 --- a/config/missing_symbols.c +++ b/config/missing_symbols.c @@ -1,7 +1,5 @@ #include -void Java_jdk_net_WindowsSocketOptions_getIpDontFragment0(){} -void Java_jdk_net_WindowsSocketOptions_setIpDontFragment0(){} void TransmitFile(){} void Java_com_sun_management_internal_OperatingSystemImpl_initialize0(){} void _Java_com_sun_management_internal_OperatingSystemImpl_initialize0(){} From 8f16ab1bb3c50dc425c004d43229c07a14ca8d85 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Wed, 17 Jan 2024 14:02:48 +0530 Subject: [PATCH 7/9] Update linter.yml --- .github/workflows/linter.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 12536edfe..d1e122def 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -5,7 +5,7 @@ on: pull_request: concurrency: - group: ${{ github.event.pull_request.number || github.ref }} + group: ${{ github.ref }} cancel-in-progress: true jobs: @@ -81,4 +81,4 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | - core.setFailed("Linting errors found! Please check workflow summary for details.") \ No newline at end of file + core.setFailed("Linting errors found! Please check workflow summary for details.") From ce6466aa001643c89b72d9df0303df68847e4872 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Wed, 17 Jan 2024 14:13:35 +0530 Subject: [PATCH 8/9] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0322a8082..39cac0cda 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ on: type: boolean concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs: From 84dc888b3ce6abb70d97f3f9827115c611f1d85d Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Wed, 17 Jan 2024 14:13:46 +0530 Subject: [PATCH 9/9] Update linter.yml --- .github/workflows/linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index d1e122def..3d3db78dc 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -5,7 +5,7 @@ on: pull_request: concurrency: - group: ${{ github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs: