From 0fd971cddf8718ef84d8b8014e28d62d8fd82c0e Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 14:04:17 -0300 Subject: [PATCH 01/65] Create qt.yml --- .github/workflows/qt.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/qt.yml diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml new file mode 100644 index 00000000..1e8fb04e --- /dev/null +++ b/.github/workflows/qt.yml @@ -0,0 +1,16 @@ +name: MultiMC5-Release + +on: + push: + branches: + - develop + - stable + - CI + pull_request: + branches: + - master + - releases + +jobs: + build: + runs-on: From c7ee8fad9fe9ca7fe1f100cf521c3cb03f77938a Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 14:22:23 -0300 Subject: [PATCH 02/65] Test install QT --- .github/workflows/qt.yml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 1e8fb04e..de71ede1 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -10,7 +10,35 @@ on: branches: - master - releases + - CI jobs: build: - runs-on: + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [windows-latest] + + steps: + - name: Context + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + run: echo "$GITHUB_CONTEXT" + - uses: actions/checkout@v2 + with: + fetch-depth: 1 + + - name: Install QT + uses: jurplel/install-qt-action@v2.13.2 + with: + # Directory to install Qt + #dir: # optional + # Version of Qt to install + version: 5.6 # optional, default is 5.15.2 + # Host platform + host: windows # optional + # Target platform for build + target: desktop # optional, default is desktop + # Architecture for Windows/Android + arch: win32_mingw49 # optional From 6c7876d432960a29b3875315ff023b65a30f40b8 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 14:25:24 -0300 Subject: [PATCH 03/65] fixes qt version --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index de71ede1..b6da8b0f 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -35,7 +35,7 @@ jobs: # Directory to install Qt #dir: # optional # Version of Qt to install - version: 5.6 # optional, default is 5.15.2 + version: 5.6.preview # optional, default is 5.15.2 # Host platform host: windows # optional # Target platform for build From 635f5b4317e14130efcbe83610cf5d41717ef1d4 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 14:27:07 -0300 Subject: [PATCH 04/65] Fixes again --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index b6da8b0f..b707783d 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -35,7 +35,7 @@ jobs: # Directory to install Qt #dir: # optional # Version of Qt to install - version: 5.6.preview # optional, default is 5.15.2 + version: 5.6_preview # optional, default is 5.15.2 # Host platform host: windows # optional # Target platform for build From a05f1919473c406b7494c930baaa99bfe32ac603 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 17:12:06 -0300 Subject: [PATCH 05/65] Test adding account file --- .github/workflows/qt.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index b707783d..c208c18c 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -29,6 +29,26 @@ jobs: with: fetch-depth: 1 + - name: Creates QtAccount File + uses: DamianReeves/write-file-action@v1.0 + with: + # The path to the file to write + path: "%APPDATA%\\Qt" + # The contents of the file + contents: ${{ secrets.QTACCOUNT }} + + - name: File Reader + # You may pin to the exact commit or the version. + # uses: andstor/file-reader-action@babb053761401147562e75be79d832978cc97325 + uses: andstor/file-reader-action@v1.0.0 + with: + # The path to the file to be read. + path: "%APPDATA%\\Qt" + + - name: Echo and PWD test + shell: cmd + run: echo "%APPDATA%\\Qt" + - name: Install QT uses: jurplel/install-qt-action@v2.13.2 with: From 291204cf1328e843a48f7414b0797e432a9a92b8 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 17:19:58 -0300 Subject: [PATCH 06/65] Downloads QT Installer --- .github/workflows/qt.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index c208c18c..6dad5f8b 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -37,18 +37,14 @@ jobs: # The contents of the file contents: ${{ secrets.QTACCOUNT }} - - name: File Reader - # You may pin to the exact commit or the version. - # uses: andstor/file-reader-action@babb053761401147562e75be79d832978cc97325 - uses: andstor/file-reader-action@v1.0.0 - with: - # The path to the file to be read. - path: "%APPDATA%\\Qt" - - name: Echo and PWD test shell: cmd run: echo "%APPDATA%\\Qt" + - name: Download QT Installer + run: | + curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe + - name: Install QT uses: jurplel/install-qt-action@v2.13.2 with: From c8569cd3d7a08fc8f2f1d1bcf71d1f1e846de55b Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 17:35:03 -0300 Subject: [PATCH 07/65] Caches --- .github/workflows/qt.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 6dad5f8b..1e5a1972 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -36,7 +36,7 @@ jobs: path: "%APPDATA%\\Qt" # The contents of the file contents: ${{ secrets.QTACCOUNT }} - + - name: Echo and PWD test shell: cmd run: echo "%APPDATA%\\Qt" @@ -44,17 +44,11 @@ jobs: - name: Download QT Installer run: | curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe - - - name: Install QT - uses: jurplel/install-qt-action@v2.13.2 + + - name: Cache + uses: actions/cache@v2.1.5 with: - # Directory to install Qt - #dir: # optional - # Version of Qt to install - version: 5.6_preview # optional, default is 5.15.2 - # Host platform - host: windows # optional - # Target platform for build - target: desktop # optional, default is desktop - # Architecture for Windows/Android - arch: win32_mingw49 # optional + # A list of files, directories, and wildcard patterns to cache and restore + path: "installer.exe" + # An explicit key for restoring and saving the cache + key: ${{ runner.os }}-qt56-installer From 29ed4dd5a15321a10f0e4e20e41b1895cb13c05b Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 17:40:43 -0300 Subject: [PATCH 08/65] Test Cache --- .github/workflows/qt.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 1e5a1972..b4d694f2 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -47,8 +47,14 @@ jobs: - name: Cache uses: actions/cache@v2.1.5 + id: installer-cached with: # A list of files, directories, and wildcard patterns to cache and restore path: "installer.exe" # An explicit key for restoring and saving the cache key: ${{ runner.os }}-qt56-installer + + - name: Download QT Installer + if: steps.installer-cached.outputs.cache-hit != 'true' + run: | + curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe From aafb0ea3ef770742168d590b1cefdea3ad960fee Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 17:41:47 -0300 Subject: [PATCH 09/65] Fixes Mistake --- .github/workflows/qt.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index b4d694f2..b1ecd479 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -40,10 +40,6 @@ jobs: - name: Echo and PWD test shell: cmd run: echo "%APPDATA%\\Qt" - - - name: Download QT Installer - run: | - curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe - name: Cache uses: actions/cache@v2.1.5 From 2a493f3c137ad9f4b3d7c1e08914d81b60656d72 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 18:40:24 -0300 Subject: [PATCH 10/65] Installs Qt --- .github/workflows/qt.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index b1ecd479..a177788e 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -50,7 +50,15 @@ jobs: # An explicit key for restoring and saving the cache key: ${{ runner.os }}-qt56-installer - - name: Download QT Installer + - name: Download Qt Installer if: steps.installer-cached.outputs.cache-hit != 'true' run: | curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe + + - name: Download Qt non-Interactive Script + run: | + curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/9298afaca5680765424d10413cb589a0e76382bf/qt-installer-noninteractive.qs --output nonInteractive.qs + + - name: Install Qt 5.6.3 + run: | + installer.exe -v --script nonInteractive.qs --silent From 67cc758eef60767fb744e0201405f3a597769064 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 18:41:44 -0300 Subject: [PATCH 11/65] Change to cmd --- .github/workflows/qt.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index a177788e..3b81c7e8 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -60,5 +60,6 @@ jobs: curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/9298afaca5680765424d10413cb589a0e76382bf/qt-installer-noninteractive.qs --output nonInteractive.qs - name: Install Qt 5.6.3 + shell: cmd run: | installer.exe -v --script nonInteractive.qs --silent From c7f31119af64b36e754394ba84b9ea0295a36d84 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 18:49:20 -0300 Subject: [PATCH 12/65] Updated script --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 3b81c7e8..db8e1721 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -57,7 +57,7 @@ jobs: - name: Download Qt non-Interactive Script run: | - curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/9298afaca5680765424d10413cb589a0e76382bf/qt-installer-noninteractive.qs --output nonInteractive.qs + curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/bf2a0fb18fa7358b048efb329c370b0de26ca7f7/qt-installer-noninteractive.qs --output nonInteractive.qs - name: Install Qt 5.6.3 shell: cmd From 6b00157032c6df22f4a31356ebaff3edfa6541af Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 19:34:05 -0300 Subject: [PATCH 13/65] fix Qt install & Cache it --- .github/workflows/qt.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index db8e1721..f2a4e417 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -50,6 +50,15 @@ jobs: # An explicit key for restoring and saving the cache key: ${{ runner.os }}-qt56-installer + - name: Cache Qt + uses: actions/cache@v2.1.5 + id: qt-cached + with: + # A list of files, directories, and wildcard patterns to cache and restore + path: "C:/Qt" + # An explicit key for restoring and saving the cache + key: ${{ runner.os }}-qt56-installed + - name: Download Qt Installer if: steps.installer-cached.outputs.cache-hit != 'true' run: | @@ -57,9 +66,10 @@ jobs: - name: Download Qt non-Interactive Script run: | - curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/bf2a0fb18fa7358b048efb329c370b0de26ca7f7/qt-installer-noninteractive.qs --output nonInteractive.qs + curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/3c31c42844a8dc4be79f3ca87a63d30a8982dbef/qt-installer-noninteractive.qs --output nonInteractive.qs - name: Install Qt 5.6.3 + if: steps.qt-cached.outputs.cache-hit != 'true' shell: cmd run: | installer.exe -v --script nonInteractive.qs --silent From 05f53c8254e8b1ff33aa4823a20cc7a4bb6db1f2 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 19:41:20 -0300 Subject: [PATCH 14/65] Fix Qt route --- .github/workflows/qt.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index f2a4e417..7d5e0a6f 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -55,12 +55,12 @@ jobs: id: qt-cached with: # A list of files, directories, and wildcard patterns to cache and restore - path: "C:/Qt" + path: "C:/Users/runneradmin/Qt" # An explicit key for restoring and saving the cache key: ${{ runner.os }}-qt56-installed - name: Download Qt Installer - if: steps.installer-cached.outputs.cache-hit != 'true' + if: steps.installer-cached.outputs.cache-hit != 'true' || teps.qt-cached.outputs.cache-hit != 'true' run: | curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe From a58df259bad86f6fab6b6b705023bf56a41d6b58 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 19:42:00 -0300 Subject: [PATCH 15/65] fix --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 7d5e0a6f..1d5752bf 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -60,7 +60,7 @@ jobs: key: ${{ runner.os }}-qt56-installed - name: Download Qt Installer - if: steps.installer-cached.outputs.cache-hit != 'true' || teps.qt-cached.outputs.cache-hit != 'true' + if: steps.installer-cached.outputs.cache-hit != 'true' || steps.qt-cached.outputs.cache-hit != 'true' run: | curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe From a0f48a959441a2c8c7f755e2274fe3b1fd902598 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 19:44:08 -0300 Subject: [PATCH 16/65] lil fix --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 1d5752bf..1553f978 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -60,7 +60,7 @@ jobs: key: ${{ runner.os }}-qt56-installed - name: Download Qt Installer - if: steps.installer-cached.outputs.cache-hit != 'true' || steps.qt-cached.outputs.cache-hit != 'true' + if: steps.installer-cached.outputs.cache-hit != 'true' && steps.qt-cached.outputs.cache-hit != 'true' run: | curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe From ec41f0f2921504b6e57d4ae7149cb3679e3941c5 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 19:56:41 -0300 Subject: [PATCH 17/65] Hopefully last script update --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 1553f978..2f029aa6 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -66,7 +66,7 @@ jobs: - name: Download Qt non-Interactive Script run: | - curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/3c31c42844a8dc4be79f3ca87a63d30a8982dbef/qt-installer-noninteractive.qs --output nonInteractive.qs + curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/198ecd6e3a090c75a96a03a4582d8a41a0f0be83/qt-installer-noninteractive.qs --output nonInteractive.qs - name: Install Qt 5.6.3 if: steps.qt-cached.outputs.cache-hit != 'true' From 1c2b30986e8aa47593905418de4663d5355f89cd Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 20:27:22 -0300 Subject: [PATCH 18/65] Add JDK and CMake --- .github/workflows/qt.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 2f029aa6..3664ad30 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -73,3 +73,15 @@ jobs: shell: cmd run: | installer.exe -v --script nonInteractive.qs --silent + + - name: Setup CMake + uses: jwlawson/actions-setup-cmake@v1.8 + with: + cmake-version: '3.16.x' + + - name: Setup JDK + uses: actions/setup-java@v2 + with: + distribution: 'zulu' # See 'Supported distributions' for available options + java-version: '8' + From 884fb3f01fb59906ea8d3a464d460071d883e281 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 21:00:37 -0300 Subject: [PATCH 19/65] Changed archs to x86, add zlib --- .github/workflows/qt.yml | 55 +++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 3664ad30..efc4bc16 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -28,29 +28,8 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - - name: Creates QtAccount File - uses: DamianReeves/write-file-action@v1.0 - with: - # The path to the file to write - path: "%APPDATA%\\Qt" - # The contents of the file - contents: ${{ secrets.QTACCOUNT }} - - - name: Echo and PWD test - shell: cmd - run: echo "%APPDATA%\\Qt" - - - name: Cache - uses: actions/cache@v2.1.5 - id: installer-cached - with: - # A list of files, directories, and wildcard patterns to cache and restore - path: "installer.exe" - # An explicit key for restoring and saving the cache - key: ${{ runner.os }}-qt56-installer - - - name: Cache Qt + + - name: Cache Qt Installed uses: actions/cache@v2.1.5 id: qt-cached with: @@ -58,6 +37,25 @@ jobs: path: "C:/Users/runneradmin/Qt" # An explicit key for restoring and saving the cache key: ${{ runner.os }}-qt56-installed + + - name: Cache Qt Installer + uses: actions/cache@v2.1.5 + if: steps.qt-cached.outputs.cache-hit != 'true' + id: installer-cached + with: + # A list of files, directories, and wildcard patterns to cache and restore + path: "installer.exe" + # An explicit key for restoring and saving the cache + key: ${{ runner.os }}-qt56-installer + + - name: Creates QtAccount File + uses: DamianReeves/write-file-action@v1.0 + if: steps.qt-cached.outputs.cache-hit != 'true' + with: + # The path to the file to write + path: "%APPDATA%\\Qt" + # The contents of the file + contents: ${{ secrets.QTACCOUNT }} - name: Download Qt Installer if: steps.installer-cached.outputs.cache-hit != 'true' && steps.qt-cached.outputs.cache-hit != 'true' @@ -75,13 +73,18 @@ jobs: installer.exe -v --script nonInteractive.qs --silent - name: Setup CMake - uses: jwlawson/actions-setup-cmake@v1.8 - with: - cmake-version: '3.16.x' + run: | + curl https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-windows-i386.msi -o cmake.msi + ./cmake.msi /S - name: Setup JDK uses: actions/setup-java@v2 with: distribution: 'zulu' # See 'Supported distributions' for available options java-version: '8' + architecture: x86 + - name: Setup zlib + run: | + curl https://razaoinfo.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-bin.zip -o zlib.zip + unzip zlib.zip From 8db37b9d82c140c763baa78e1519cdd1dfdedec8 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 21:08:17 -0300 Subject: [PATCH 20/65] make curl follow redirects and folder for zlib --- .github/workflows/qt.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index efc4bc16..9064911a 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -74,7 +74,7 @@ jobs: - name: Setup CMake run: | - curl https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-windows-i386.msi -o cmake.msi + curl -L https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-windows-i386.msi -o cmake.msi ./cmake.msi /S - name: Setup JDK @@ -86,5 +86,8 @@ jobs: - name: Setup zlib run: | + mkdir zlib curl https://razaoinfo.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-bin.zip -o zlib.zip unzip zlib.zip + cd .. + pwd From e3555c044086f44b6a368b8a8b21e58480d550e3 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 21:17:50 -0300 Subject: [PATCH 21/65] Why CMake, WHY! --- .github/workflows/qt.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 9064911a..d7477507 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -74,8 +74,7 @@ jobs: - name: Setup CMake run: | - curl -L https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-windows-i386.msi -o cmake.msi - ./cmake.msi /S + curl -L https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-windows-i386.msi -o cmake.msi && ./cmake.msi /quiet - name: Setup JDK uses: actions/setup-java@v2 @@ -86,8 +85,4 @@ jobs: - name: Setup zlib run: | - mkdir zlib - curl https://razaoinfo.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-bin.zip -o zlib.zip - unzip zlib.zip - cd .. - pwd + mkdir zlib && curl https://razaoinfo.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-bin.zip -o zlib.zip && unzip zlib.zip && cd .. && pwd From c04fd2d85f81b46b6551e0f953db5cc9d50ad2ad Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 21:41:55 -0300 Subject: [PATCH 22/65] temporal removal of QT, testing resulting path --- .github/workflows/qt.yml | 50 ++++++++-------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index d7477507..ce654a65 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -29,48 +29,7 @@ jobs: with: fetch-depth: 1 - - name: Cache Qt Installed - uses: actions/cache@v2.1.5 - id: qt-cached - with: - # A list of files, directories, and wildcard patterns to cache and restore - path: "C:/Users/runneradmin/Qt" - # An explicit key for restoring and saving the cache - key: ${{ runner.os }}-qt56-installed - - - name: Cache Qt Installer - uses: actions/cache@v2.1.5 - if: steps.qt-cached.outputs.cache-hit != 'true' - id: installer-cached - with: - # A list of files, directories, and wildcard patterns to cache and restore - path: "installer.exe" - # An explicit key for restoring and saving the cache - key: ${{ runner.os }}-qt56-installer - - - name: Creates QtAccount File - uses: DamianReeves/write-file-action@v1.0 - if: steps.qt-cached.outputs.cache-hit != 'true' - with: - # The path to the file to write - path: "%APPDATA%\\Qt" - # The contents of the file - contents: ${{ secrets.QTACCOUNT }} - - name: Download Qt Installer - if: steps.installer-cached.outputs.cache-hit != 'true' && steps.qt-cached.outputs.cache-hit != 'true' - run: | - curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe - - - name: Download Qt non-Interactive Script - run: | - curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/198ecd6e3a090c75a96a03a4582d8a41a0f0be83/qt-installer-noninteractive.qs --output nonInteractive.qs - - - name: Install Qt 5.6.3 - if: steps.qt-cached.outputs.cache-hit != 'true' - shell: cmd - run: | - installer.exe -v --script nonInteractive.qs --silent - name: Setup CMake run: | @@ -86,3 +45,12 @@ jobs: - name: Setup zlib run: | mkdir zlib && curl https://razaoinfo.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-bin.zip -o zlib.zip && unzip zlib.zip && cd .. && pwd + + - name: Setup PATH + shell: cmd + run: | + set PATH=C:\Users\runneradmin\Qt\Qt5.6.0\5.6\mingw49_32\bin;C:\Users\runneradmin\Qtr\Qt5.6.0\Tools\mingw492_32\bin;%PATH% + set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% + set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% + java --version + cmake --version From d94d0e25bceb545d554ae1abe1fad70f938fab57 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 21:50:26 -0300 Subject: [PATCH 23/65] Add OpenSSL && Fixes Java version output --- .github/workflows/qt.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index ce654a65..49cd62d6 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -44,13 +44,29 @@ jobs: - name: Setup zlib run: | - mkdir zlib && curl https://razaoinfo.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-bin.zip -o zlib.zip && unzip zlib.zip && cd .. && pwd + mkdir zlib + cd zlib + curl -L https://razaoinfo.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-bin.zip -o zlib.zip + unzip zlib.zip + cd .. + pwd + + - name: Setup OpenSSL + run: | + mkdir OpenSSL + cd OpenSSL + curl -L https://github.com/IndySockets/OpenSSL-Binaries/raw/master/Archive/openssl-1.0.2g-i386-win32.zip -o OpenSSL.zip + unzip OpenSSL.zip + cd .. + pwd - name: Setup PATH shell: cmd run: | set PATH=C:\Users\runneradmin\Qt\Qt5.6.0\5.6\mingw49_32\bin;C:\Users\runneradmin\Qtr\Qt5.6.0\Tools\mingw492_32\bin;%PATH% set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% + set PATH=%CD%\OpenSSL;%PATH% set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% - java --version + java -version cmake --version + openssl version From 145a76ead2457bc2234ff625604ae6ac9223b1f2 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 21:54:16 -0300 Subject: [PATCH 24/65] Test --- .github/workflows/qt.yml | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 49cd62d6..51fc32cb 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -29,7 +29,45 @@ jobs: with: fetch-depth: 1 + - name: Cache Qt Installed + uses: actions/cache@v2.1.5 + id: qt-cached + with: + # A list of files, directories, and wildcard patterns to cache and restore + path: "C:/Users/runneradmin/Qt" + # An explicit key for restoring and saving the cache + key: ${{ runner.os }}-qt56-installed + + - name: Cache Qt Installer + uses: actions/cache@v2.1.5 + if: steps.qt-cached.outputs.cache-hit != 'true' + id: installer-cached + with: + # A list of files, directories, and wildcard patterns to cache and restore + path: "installer.exe" + # An explicit key for restoring and saving the cache + key: ${{ runner.os }}-qt56-installer + + - name: Creates QtAccount File + uses: DamianReeves/write-file-action@v1.0 + if: steps.qt-cached.outputs.cache-hit != 'true' + with: + # The path to the file to write + path: "%APPDATA%\\Qt" + # The contents of the file + contents: ${{ secrets.QTACCOUNT }} + - name: Download Qt Installer + if: steps.installer-cached.outputs.cache-hit != 'true' && steps.qt-cached.outputs.cache-hit != 'true' + run: | + curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe + curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/198ecd6e3a090c75a96a03a4582d8a41a0f0be83/qt-installer-noninteractive.qs --output nonInteractive.qs + + - name: Install Qt 5.6.3 + if: steps.qt-cached.outputs.cache-hit != 'true' + shell: cmd + run: | + installer.exe -v --script nonInteractive.qs --silent - name: Setup CMake run: | @@ -70,3 +108,9 @@ jobs: java -version cmake --version openssl version + + - name: build + shell: cmd + run: | + cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=C: + From 54e1c154de92d9d555711dd6e2712e25dd64af9b Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 22:34:42 -0300 Subject: [PATCH 25/65] Test Qt --- .github/workflows/qt.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 51fc32cb..4442a7a5 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -108,6 +108,12 @@ jobs: java -version cmake --version openssl version + dir + ls + dir C:\Users\runneradmin\Qt\Qt5.6.0\5.6\mingw49_32\bin + ls C:\Users\runneradmin\Qt\Qt5.6.0\5.6\mingw49_32\bin + dir C:\Users\runneradmin\Qtr\Qt5.6.0\Tools\mingw492_32\bin + ls C:\Users\runneradmin\Qtr\Qt5.6.0\Tools\mingw492_32\bin - name: build shell: cmd From c1e5f502717fc51058d7c91617868e6fe4a8ce3c Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 22:52:48 -0300 Subject: [PATCH 26/65] Test fixes --- .github/workflows/qt.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 4442a7a5..256b465d 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -34,9 +34,9 @@ jobs: id: qt-cached with: # A list of files, directories, and wildcard patterns to cache and restore - path: "C:/Users/runneradmin/Qt" + path: "D:/Qt" # An explicit key for restoring and saving the cache - key: ${{ runner.os }}-qt56-installed + key: ${{ runner.os }}-qt56-installed-d - name: Cache Qt Installer uses: actions/cache@v2.1.5 @@ -61,7 +61,7 @@ jobs: if: steps.installer-cached.outputs.cache-hit != 'true' && steps.qt-cached.outputs.cache-hit != 'true' run: | curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe - curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/198ecd6e3a090c75a96a03a4582d8a41a0f0be83/qt-installer-noninteractive.qs --output nonInteractive.qs + curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/09cb1415952b914f1567ce935d4618c396aec340/qt-installer-noninteractive.qs --output nonInteractive.qs - name: Install Qt 5.6.3 if: steps.qt-cached.outputs.cache-hit != 'true' @@ -101,7 +101,7 @@ jobs: - name: Setup PATH shell: cmd run: | - set PATH=C:\Users\runneradmin\Qt\Qt5.6.0\5.6\mingw49_32\bin;C:\Users\runneradmin\Qtr\Qt5.6.0\Tools\mingw492_32\bin;%PATH% + set PATH=D:\Qt\Qt5.6.0\5.6\mingw49_32\bin;D:\Qt\Qt5.6.0\Tools\mingw492_32\bin;%PATH% set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% set PATH=%CD%\OpenSSL;%PATH% set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% @@ -110,13 +110,15 @@ jobs: openssl version dir ls - dir C:\Users\runneradmin\Qt\Qt5.6.0\5.6\mingw49_32\bin - ls C:\Users\runneradmin\Qt\Qt5.6.0\5.6\mingw49_32\bin - dir C:\Users\runneradmin\Qtr\Qt5.6.0\Tools\mingw492_32\bin - ls C:\Users\runneradmin\Qtr\Qt5.6.0\Tools\mingw492_32\bin + dir D:\Qt\Qt5.6.0\5.6\mingw49_32\bin + ls D:\Qt\Qt5.6.0\5.6\mingw49_32\bin + dir D:\Qt\Qt5.6.0\Tools\mingw492_32\bin + ls D:\Qt\Qt5.6.0\Tools\mingw492_32\bin - name: build shell: cmd run: | - cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=C: + mkdir build + cd build + cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC From 8d3b51c3573dffc6c168b88ba224e3b28b2f06c6 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 22:55:56 -0300 Subject: [PATCH 27/65] When did that go wrong(? --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 256b465d..8b1600b7 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -53,7 +53,7 @@ jobs: if: steps.qt-cached.outputs.cache-hit != 'true' with: # The path to the file to write - path: "%APPDATA%\\Qt" + path: "%APPDATA%\\Qt\\qtaccount.ini" # The contents of the file contents: ${{ secrets.QTACCOUNT }} From a0dd8784bcf55ecbb4810014a88d4f8a42af109a Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 22:59:05 -0300 Subject: [PATCH 28/65] WTF --- .github/workflows/qt.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 8b1600b7..9dcfc4c9 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -28,6 +28,15 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 + + - name: Creates QtAccount File + uses: DamianReeves/write-file-action@v1.0 + if: steps.qt-cached.outputs.cache-hit != 'true' + with: + # The path to the file to write + path: "C:\\Users\\runneradmin\\AppData\\Roaming\\Qt\\qtaccount.ini" + # The contents of the file + contents: ${{ secrets.QTACCOUNT }} - name: Cache Qt Installed uses: actions/cache@v2.1.5 @@ -47,15 +56,6 @@ jobs: path: "installer.exe" # An explicit key for restoring and saving the cache key: ${{ runner.os }}-qt56-installer - - - name: Creates QtAccount File - uses: DamianReeves/write-file-action@v1.0 - if: steps.qt-cached.outputs.cache-hit != 'true' - with: - # The path to the file to write - path: "%APPDATA%\\Qt\\qtaccount.ini" - # The contents of the file - contents: ${{ secrets.QTACCOUNT }} - name: Download Qt Installer if: steps.installer-cached.outputs.cache-hit != 'true' && steps.qt-cached.outputs.cache-hit != 'true' From ca5eaf5bee8d0b780246a56d58ec1c32cece2749 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:02:07 -0300 Subject: [PATCH 29/65] Updated SECRET --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 9dcfc4c9..0ef2a06f 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -120,5 +120,5 @@ jobs: run: | mkdir build cd build - cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC + cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked From aa53b43a3225d1177cddc7bda56149c97b62e8bb Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:04:53 -0300 Subject: [PATCH 30/65] FACEPALM --- .github/workflows/qt.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 0ef2a06f..57b7291b 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -61,6 +61,10 @@ jobs: if: steps.installer-cached.outputs.cache-hit != 'true' && steps.qt-cached.outputs.cache-hit != 'true' run: | curl https://download.qt.io/new_archive/qt/5.6/5.6.3/qt-opensource-windows-x86-mingw492-5.6.3.exe --output installer.exe + + - name: Download Qt non-Interactive Script + if: steps.qt-cached.outputs.cache-hit != 'true' + run: | curl https://gist.githubusercontent.com/PibePlayer/cf6bd0a9f7e4d51e3e618ceedfba4b94/raw/09cb1415952b914f1567ce935d4618c396aec340/qt-installer-noninteractive.qs --output nonInteractive.qs - name: Install Qt 5.6.3 From 1e2e71f47dad08ced503bfd7f540481ef45a931e Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:10:03 -0300 Subject: [PATCH 31/65] I admit it, that was stupid --- .github/workflows/qt.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 57b7291b..6fbd81e2 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -105,7 +105,7 @@ jobs: - name: Setup PATH shell: cmd run: | - set PATH=D:\Qt\Qt5.6.0\5.6\mingw49_32\bin;D:\Qt\Qt5.6.0\Tools\mingw492_32\bin;%PATH% + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% set PATH=%CD%\OpenSSL;%PATH% set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% @@ -114,10 +114,10 @@ jobs: openssl version dir ls - dir D:\Qt\Qt5.6.0\5.6\mingw49_32\bin - ls D:\Qt\Qt5.6.0\5.6\mingw49_32\bin - dir D:\Qt\Qt5.6.0\Tools\mingw492_32\bin - ls D:\Qt\Qt5.6.0\Tools\mingw492_32\bin + dir D:\Qt\5.6.3\mingw49_32\bin + ls D:\Qt\5.6.3\mingw49_32\bin + dir D:/Qt/Tools/mingw492_32\bin + ls D:/Qt/Tools/mingw492_32\bin - name: build shell: cmd From 958774d9a88ee9f894de36add3e7928f0d131973 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:14:03 -0300 Subject: [PATCH 32/65] Set CMAKE properly (I hope) --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 6fbd81e2..f334fe7c 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -124,5 +124,5 @@ jobs: run: | mkdir build cd build - cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked + cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ../ From dc1fb365168d8ecbb0c0455d55c3d939d4b5006c Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:24:52 -0300 Subject: [PATCH 33/65] Properly set compiler for CMake --- .github/workflows/qt.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index f334fe7c..a5c0ff86 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -122,7 +122,11 @@ jobs: - name: build shell: cmd run: | + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% + set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% + set PATH=%CD%\OpenSSL;%PATH% + set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% mkdir build cd build - cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ../ + CC=D:/Qt/Tools/mingw492_32\bin\gcc.exe CXX=D:/Qt/Tools/mingw492_32\bin\g++.exe cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ../ From 45c19dd89f537fd3c8c372c6e2e4fd7fc1345292 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:29:22 -0300 Subject: [PATCH 34/65] This isn't linux for god's sake --- .github/workflows/qt.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index a5c0ff86..22909b21 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -126,7 +126,9 @@ jobs: set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% set PATH=%CD%\OpenSSL;%PATH% set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% + set CC=D:/Qt/Tools/mingw492_32\bin\gcc.exe + set CXX=D:/Qt/Tools/mingw492_32\bin\g++.exe mkdir build cd build - CC=D:/Qt/Tools/mingw492_32\bin\gcc.exe CXX=D:/Qt/Tools/mingw492_32\bin\g++.exe cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ../ + cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ../ From 66492c0cb8e2d776a9bc701902d12524cc899d57 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:35:19 -0300 Subject: [PATCH 35/65] View CMake Output --- .github/workflows/qt.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 22909b21..44c80399 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -131,4 +131,8 @@ jobs: mkdir build cd build cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ../ + + - name: cat CMake Output + run: | + cat D:/a/MultiMC5-Cracked/MultiMC5-Cracked/build/CMakeFiles/CMakeOutput.log From 020178972792579b37bf95d7e402da19bf9644c6 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:40:31 -0300 Subject: [PATCH 36/65] didn't see that coming --- .github/workflows/qt.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 44c80399..b9502bce 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -133,6 +133,7 @@ jobs: cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ../ - name: cat CMake Output + if: ${{ failure() }} run: | cat D:/a/MultiMC5-Cracked/MultiMC5-Cracked/build/CMakeFiles/CMakeOutput.log From 17a0416a496b3f71e445b90d5817c04e9df6c5c3 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:43:54 -0300 Subject: [PATCH 37/65] Checkout Submodules --- .github/workflows/qt.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index b9502bce..41799593 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -29,6 +29,9 @@ jobs: with: fetch-depth: 1 + - name: Checkout submodules + run: git submodule update --init + - name: Creates QtAccount File uses: DamianReeves/write-file-action@v1.0 if: steps.qt-cached.outputs.cache-hit != 'true' From 0ec7121de3a1fe2cfb6f6facf3c06d3242c0a717 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:50:03 -0300 Subject: [PATCH 38/65] added make and install --- .github/workflows/qt.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 41799593..d79c3ffb 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -139,4 +139,13 @@ jobs: if: ${{ failure() }} run: | cat D:/a/MultiMC5-Cracked/MultiMC5-Cracked/build/CMakeFiles/CMakeOutput.log - + + - name: make + shell: cmd + run: | + mingw32-make -j8 + + - name: install + shell: cmd + run: | + mingw32-make install From b51ac707973ab354e928e61c57e03c708d902d1b Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:54:51 -0300 Subject: [PATCH 39/65] tst --- .github/workflows/qt.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index d79c3ffb..e4cf2277 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -131,8 +131,6 @@ jobs: set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% set CC=D:/Qt/Tools/mingw492_32\bin\gcc.exe set CXX=D:/Qt/Tools/mingw492_32\bin\g++.exe - mkdir build - cd build cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ../ - name: cat CMake Output From ff496bdfacb5a2a404bfdcd4d80d897c6cd0d416 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:58:33 -0300 Subject: [PATCH 40/65] lol --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index e4cf2277..948fc506 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -131,7 +131,7 @@ jobs: set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% set CC=D:/Qt/Tools/mingw492_32\bin\gcc.exe set CXX=D:/Qt/Tools/mingw492_32\bin\g++.exe - cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ../ + cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked - name: cat CMake Output if: ${{ failure() }} From 96bf92c7365e544328c7cb39adf89d801f018e6d Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Wed, 5 May 2021 23:59:46 -0300 Subject: [PATCH 41/65] test 2 --- .github/workflows/qt.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 948fc506..f4807d13 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -131,7 +131,10 @@ jobs: set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% set CC=D:/Qt/Tools/mingw492_32\bin\gcc.exe set CXX=D:/Qt/Tools/mingw492_32\bin\g++.exe - cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked + mkdir build + cd build + cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ..\ + ls - name: cat CMake Output if: ${{ failure() }} @@ -141,6 +144,7 @@ jobs: - name: make shell: cmd run: | + dir mingw32-make -j8 - name: install From 6f6f387b7260e18a1c9e0cd1a3d39324dada0a60 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 00:07:51 -0300 Subject: [PATCH 42/65] Test with build directory --- .github/workflows/qt.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index f4807d13..14758e4d 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -144,10 +144,11 @@ jobs: - name: make shell: cmd run: | - dir + cd build mingw32-make -j8 - name: install shell: cmd run: | + cd build mingw32-make install From 0d76bfd6ccf4250c7b624192cc0b6edb902e543d Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 00:11:25 -0300 Subject: [PATCH 43/65] Another Test --- .github/workflows/qt.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 14758e4d..dee1e389 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -134,6 +134,8 @@ jobs: mkdir build cd build cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ..\ + mingw32-make -j8 + mingw32-make install ls - name: cat CMake Output From 2ac1a89ed4e5a52d5db4ba3071e1c22ed234efa5 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 00:17:37 -0300 Subject: [PATCH 44/65] yep, no idea now --- .github/workflows/qt.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index dee1e389..6bebe512 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -41,14 +41,14 @@ jobs: # The contents of the file contents: ${{ secrets.QTACCOUNT }} - - name: Cache Qt Installed - uses: actions/cache@v2.1.5 - id: qt-cached - with: + #- name: Cache Qt Installed + #uses: actions/cache@v2.1.5 + #id: qt-cached + #with: # A list of files, directories, and wildcard patterns to cache and restore - path: "D:/Qt" + #path: "D:/Qt" # An explicit key for restoring and saving the cache - key: ${{ runner.os }}-qt56-installed-d + #key: ${{ runner.os }}-qt56-installed-d - name: Cache Qt Installer uses: actions/cache@v2.1.5 @@ -129,13 +129,11 @@ jobs: set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% set PATH=%CD%\OpenSSL;%PATH% set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% - set CC=D:/Qt/Tools/mingw492_32\bin\gcc.exe - set CXX=D:/Qt/Tools/mingw492_32\bin\g++.exe + set CC=D:\Qt\Tools\mingw492_32\bin\gcc.exe + set CXX=D:\Qt\Tools\mingw492_32\bin\g++.exe mkdir build cd build - cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ..\ - mingw32-make -j8 - mingw32-make install + cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ..\ && echo . && mingw32-make -j8 && echo . && mingw32-make install ls - name: cat CMake Output From c7fdd7996ec690b9f4c098dd15cf9a86f2ca9ade Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 00:22:31 -0300 Subject: [PATCH 45/65] Tell me why does it fail --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 6bebe512..fd9dbdae 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -133,7 +133,7 @@ jobs: set CXX=D:\Qt\Tools\mingw492_32\bin\g++.exe mkdir build cd build - cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ..\ && echo . && mingw32-make -j8 && echo . && mingw32-make install + cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ..\ ls - name: cat CMake Output From a4dae3adabc50e3bc19aefc680cbc9e4dade2309 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 00:28:07 -0300 Subject: [PATCH 46/65] Maybe, and just maybe... --- .github/workflows/qt.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index fd9dbdae..2ae44e57 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -115,12 +115,6 @@ jobs: java -version cmake --version openssl version - dir - ls - dir D:\Qt\5.6.3\mingw49_32\bin - ls D:\Qt\5.6.3\mingw49_32\bin - dir D:/Qt/Tools/mingw492_32\bin - ls D:/Qt/Tools/mingw492_32\bin - name: build shell: cmd @@ -144,8 +138,14 @@ jobs: - name: make shell: cmd run: | + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% + set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% + set PATH=%CD%\OpenSSL;%PATH% + set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% + set CC=D:\Qt\Tools\mingw492_32\bin\gcc.exe + set CXX=D:\Qt\Tools\mingw492_32\bin\g++.exe cd build - mingw32-make -j8 + mingw32-make - name: install shell: cmd From 39e2930a509640a3ad91271ff1461a575110361b Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 00:38:12 -0300 Subject: [PATCH 47/65] Sorcery --- .github/workflows/qt.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 2ae44e57..0451c547 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -138,12 +138,10 @@ jobs: - name: make shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% set PATH=%CD%\OpenSSL;%PATH% set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% - set CC=D:\Qt\Tools\mingw492_32\bin\gcc.exe - set CXX=D:\Qt\Tools\mingw492_32\bin\g++.exe cd build mingw32-make From e16389dd266422de41581df906738d5e42e63574 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 00:40:45 -0300 Subject: [PATCH 48/65] Sorcery 2 --- .github/workflows/qt.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 0451c547..9ac6a482 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -127,6 +127,7 @@ jobs: set CXX=D:\Qt\Tools\mingw492_32\bin\g++.exe mkdir build cd build + cp D:/Qt/Tools/mingw492_32\bin\mingw32-make.exe D:/Qt/Tools/mingw492_32\bin\make.exe cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ..\ ls @@ -138,7 +139,7 @@ jobs: - name: make shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% set PATH=%CD%\OpenSSL;%PATH% set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% From 408c38cb7bdd8d687133f55ca84c6608d8fa241f Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 00:44:50 -0300 Subject: [PATCH 49/65] Debugging --- .github/workflows/qt.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 9ac6a482..4c385f24 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -143,8 +143,7 @@ jobs: set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% set PATH=%CD%\OpenSSL;%PATH% set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% - cd build - mingw32-make + cd build && pwd && mingw32-make && dir - name: install shell: cmd From 6fbb469e0c2657d4e01175f40e0af8fb652b1df5 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 01:34:41 -0300 Subject: [PATCH 50/65] last try(? --- .github/workflows/qt.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 4c385f24..776749b9 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -139,11 +139,8 @@ jobs: - name: make shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% - set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% - set PATH=%CD%\OpenSSL;%PATH% - set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% - cd build && pwd && mingw32-make && dir + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin + cd build && pwd && dir && mingw32-make - name: install shell: cmd From 1e5e64bb883551e9b8a179f66b6443af362eeff6 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 01:42:34 -0300 Subject: [PATCH 51/65] not that bad --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 776749b9..48f7a785 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -139,7 +139,7 @@ jobs: - name: make shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ cd build && pwd && dir && mingw32-make - name: install From 7cfbaf0c22b22faa2e9839764d6a6021a4f4b809 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 01:49:11 -0300 Subject: [PATCH 52/65] FACEPALM v2 --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 48f7a785..5b59fca8 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -140,7 +140,7 @@ jobs: shell: cmd run: | set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ - cd build && pwd && dir && mingw32-make + cd build && echo %CD% && dir && mingw32-make - name: install shell: cmd From 85f311fff26d5708ed45c8024244904cb62d5d02 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 02:01:20 -0300 Subject: [PATCH 53/65] HOW DID IT BECAME BROKEN!? --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 5b59fca8..665fef61 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -140,7 +140,7 @@ jobs: shell: cmd run: | set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ - cd build && echo %CD% && dir && mingw32-make + cd build && dir && mingw32-make - name: install shell: cmd From aa0442f7fc61f7f8f29f8772fc3cc2641919853c Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 02:06:37 -0300 Subject: [PATCH 54/65] Add cmake to PATH? --- .github/workflows/qt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 665fef61..b9aac8b4 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -139,7 +139,7 @@ jobs: - name: make shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;"C:\\Program Files (x86)\\CMake\\bin";C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ cd build && dir && mingw32-make - name: install From 39db169bc071d4293e56b9a10909bb37efb3d914 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 02:12:20 -0300 Subject: [PATCH 55/65] Mistakes were made... --- .github/workflows/qt.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index b9aac8b4..fb2cebba 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -130,6 +130,7 @@ jobs: cp D:/Qt/Tools/mingw492_32\bin\mingw32-make.exe D:/Qt/Tools/mingw492_32\bin\make.exe cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ..\ ls + echo %PATH% - name: cat CMake Output if: ${{ failure() }} @@ -139,7 +140,7 @@ jobs: - name: make shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;"C:\\Program Files (x86)\\CMake\\bin";C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;"C:\\Program Files\\CMake\\bin\\cmake.exe";C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ cd build && dir && mingw32-make - name: install From eaf8994fd7c1d58ce80bd31722c784281ab189d0 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 02:21:02 -0300 Subject: [PATCH 56/65] Set good PATH for CMake(? --- .github/workflows/qt.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index fb2cebba..733ac3a6 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -112,17 +112,16 @@ jobs: set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% set PATH=%CD%\OpenSSL;%PATH% set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% + ls "C:\\Program Files (x86)\\CMake\\bin\\" java -version cmake --version + "C:\\Program Files (x86)\\CMake\\bin\\cmake.exe" --version openssl version - name: build shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% - set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% - set PATH=%CD%\OpenSSL;%PATH% - set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;"C:\\Program Files (x86)\\CMake\\bin\\";C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ set CC=D:\Qt\Tools\mingw492_32\bin\gcc.exe set CXX=D:\Qt\Tools\mingw492_32\bin\g++.exe mkdir build @@ -140,7 +139,7 @@ jobs: - name: make shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;"C:\\Program Files\\CMake\\bin\\cmake.exe";C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;"C:\\Program Files (x86)\\CMake\\bin\\";C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ cd build && dir && mingw32-make - name: install From 3756fc3d397f0879ea199b915d7c48102aad6e2f Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 02:36:24 -0300 Subject: [PATCH 57/65] Thanks cmake, really --- .github/workflows/qt.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 733ac3a6..24a6b937 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -78,7 +78,9 @@ jobs: - name: Setup CMake run: | - curl -L https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-windows-i386.msi -o cmake.msi && ./cmake.msi /quiet + curl -L https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-windows-i386.zip -o cmake.zip + unzip cmake.zip + dir cmake-3.20.2-windows-i386/bin - name: Setup JDK uses: actions/setup-java@v2 @@ -111,24 +113,23 @@ jobs: set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% set PATH=%CD%\OpenSSL;%PATH% + set PATH=%CD%\cmake-3.20.2-windows-i386\bin;%PATH% set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% - ls "C:\\Program Files (x86)\\CMake\\bin\\" java -version cmake --version - "C:\\Program Files (x86)\\CMake\\bin\\cmake.exe" --version openssl version - name: build shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;"C:\\Program Files (x86)\\CMake\\bin\\";C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%CD%\cmake-3.20.2-windows-i386\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ set CC=D:\Qt\Tools\mingw492_32\bin\gcc.exe set CXX=D:\Qt\Tools\mingw492_32\bin\g++.exe mkdir build cd build - cp D:/Qt/Tools/mingw492_32\bin\mingw32-make.exe D:/Qt/Tools/mingw492_32\bin\make.exe + copy D:/Qt/Tools/mingw492_32\bin\mingw32-make.exe D:/Qt/Tools/mingw492_32\bin\make.exe cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:/MultiMC-Cracked ..\ - ls + dir echo %PATH% - name: cat CMake Output @@ -139,7 +140,7 @@ jobs: - name: make shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;"C:\\Program Files (x86)\\CMake\\bin\\";C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%CD%\cmake-3.20.2-windows-i386\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ cd build && dir && mingw32-make - name: install From 4307801a373dfe1c4979725434928c40b8b4ed53 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 02:49:23 -0300 Subject: [PATCH 58/65] + Zlib --- .github/workflows/qt.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 24a6b937..89294be2 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -94,7 +94,9 @@ jobs: mkdir zlib cd zlib curl -L https://razaoinfo.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-bin.zip -o zlib.zip + curl -L https://ufpr.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-lib.zip -o zliblibs.zip unzip zlib.zip + unzip zliblibs.zip cd .. pwd @@ -122,7 +124,7 @@ jobs: - name: build shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%CD%\cmake-3.20.2-windows-i386\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\zlib\lib;%CD%\zlib\include;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%CD%\cmake-3.20.2-windows-i386\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ set CC=D:\Qt\Tools\mingw492_32\bin\gcc.exe set CXX=D:\Qt\Tools\mingw492_32\bin\g++.exe mkdir build From 0035bffaada59c6afabf9507bd192c988e54030d Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 02:54:49 -0300 Subject: [PATCH 59/65] YAAAYYY!!! --- .github/workflows/qt.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 89294be2..09b61962 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -41,14 +41,14 @@ jobs: # The contents of the file contents: ${{ secrets.QTACCOUNT }} - #- name: Cache Qt Installed - #uses: actions/cache@v2.1.5 - #id: qt-cached - #with: + - name: Cache Qt Installed + uses: actions/cache@v2.1.5 + id: qt-cached + with: # A list of files, directories, and wildcard patterns to cache and restore - #path: "D:/Qt" + path: "D:/Qt" # An explicit key for restoring and saving the cache - #key: ${{ runner.os }}-qt56-installed-d + key: ${{ runner.os }}-qt56-installed-d - name: Cache Qt Installer uses: actions/cache@v2.1.5 @@ -143,7 +143,7 @@ jobs: shell: cmd run: | set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%CD%\cmake-3.20.2-windows-i386\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ - cd build && dir && mingw32-make + cd build && dir && mingw32-make -j12 - name: install shell: cmd From bb71ace6d88a42ce1037ca9155e26b0d5036f789 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 03:28:54 -0300 Subject: [PATCH 60/65] Caching build --- .github/workflows/qt.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 09b61962..88285b56 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -121,6 +121,15 @@ jobs: cmake --version openssl version + - name: build cache + uses: actions/cache@v2.1.5 + id: build-cached + with: + # A list of files, directories, and wildcard patterns to cache and restore + path: "D:/a/MultiMC5-Cracked/MultiMC5-Cracked/build" + # An explicit key for restoring and saving the cache + key: ${{ runner.os }}-MultiMC-build + - name: build shell: cmd run: | From 5601ee4a244474886c877a244c8fdc3f7d4bfb44 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 03:39:53 -0300 Subject: [PATCH 61/65] Prettified PATH sets --- .github/workflows/qt.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 88285b56..49154c6c 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -133,7 +133,11 @@ jobs: - name: build shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\zlib\lib;%CD%\zlib\include;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%CD%\cmake-3.20.2-windows-i386\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% + set PATH=%CD%\zlib;%CD%\zlib\bin;%CD%\zlib\lib;%CD%\zlib\include;%PATH% + set PATH=%CD%\OpenSSL;%PATH% + set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% + set PATH=%CD%\cmake-3.20.2-windows-i386\bin;%PATH% set CC=D:\Qt\Tools\mingw492_32\bin\gcc.exe set CXX=D:\Qt\Tools\mingw492_32\bin\g++.exe mkdir build @@ -151,11 +155,16 @@ jobs: - name: make shell: cmd run: | - set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%CD%\zlib;%CD%\zlib\bin;%CD%\OpenSSL;C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%CD%\cmake-3.20.2-windows-i386\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\ + set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% + set PATH=%CD%\zlib;%CD%\zlib\bin;%PATH% + set PATH=%CD%\OpenSSL;%PATH% + set PATH=C:\hostedtoolcache\windows\Java_Zulu_jdk\8.0.292-10\x86\bin;%PATH% + set PATH=%CD%\cmake-3.20.2-windows-i386\bin;%PATH% + set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;%PATH% cd build && dir && mingw32-make -j12 - name: install shell: cmd run: | cd build - mingw32-make install + mingw32-make install -j4 From 9bcfacc1b6125e2ce8e4536d0c8aaf1328ccf044 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Thu, 6 May 2021 03:43:07 -0300 Subject: [PATCH 62/65] fixes cache --- .github/workflows/qt.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index 49154c6c..1e4e587c 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -132,6 +132,7 @@ jobs: - name: build shell: cmd + if: steps.build-cached.outputs.cache-hit != 'true' run: | set PATH=D:\Qt\5.6.3\mingw49_32\bin;D:/Qt/Tools/mingw492_32\bin;%PATH% set PATH=%CD%\zlib;%CD%\zlib\bin;%CD%\zlib\lib;%CD%\zlib\include;%PATH% From 2ff9c4b39c0418486c9b0c888acfacdae969b7c4 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Fri, 7 May 2021 18:04:56 -0300 Subject: [PATCH 63/65] Changed names and Upload Artifacts --- .github/workflows/{qt.yml => develop.yml} | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) rename .github/workflows/{qt.yml => develop.yml} (95%) diff --git a/.github/workflows/qt.yml b/.github/workflows/develop.yml similarity index 95% rename from .github/workflows/qt.yml rename to .github/workflows/develop.yml index 1e4e587c..1d0ccd8d 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/develop.yml @@ -1,4 +1,4 @@ -name: MultiMC5-Release +name: MultiMC5-Develop on: push: @@ -169,3 +169,11 @@ jobs: run: | cd build mingw32-make install -j4 + + - name: Upload Artifacts + uses: actions/upload-artifact@v2.2.3 + with: + # Artifact name + name: Installed Folder + # A file, directory or wildcard pattern that describes what to upload + path: "D:/MultiMC-Cracked" From 5e606244e19740b032ce3a3fad7dd6e2b53bab04 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Fri, 7 May 2021 19:52:41 -0300 Subject: [PATCH 64/65] Adds build number --- .github/workflows/develop.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 1d0ccd8d..9afd366b 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -4,11 +4,11 @@ on: push: branches: - develop - - stable - CI pull_request: branches: - master + - develop - releases - CI @@ -169,11 +169,17 @@ jobs: run: | cd build mingw32-make install -j4 + + - name: Generate build number + id: buildnumber + uses: einaregilsson/build-number@v3 + with: + token: ${{secrets.github_token}} - name: Upload Artifacts uses: actions/upload-artifact@v2.2.3 with: # Artifact name - name: Installed Folder + name: MultiMC5-Cracked-Portable-win32-${{ steps.buildnumber.outputs.build_number }} # A file, directory or wildcard pattern that describes what to upload path: "D:/MultiMC-Cracked" From e3a198598d449a10ce1d912eaa35defa5f3b9571 Mon Sep 17 00:00:00 2001 From: Mateo Pidal Date: Fri, 7 May 2021 19:54:56 -0300 Subject: [PATCH 65/65] updated branches --- .github/workflows/develop.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 9afd366b..cedf0fb5 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -3,13 +3,14 @@ name: MultiMC5-Develop on: push: branches: + - master - develop - CI pull_request: branches: - master - develop - - releases + - stable - CI jobs: