From d6ca3e7f1a6a0f26129baa9fd948eddeb6c8b459 Mon Sep 17 00:00:00 2001 From: Rhekar Date: Fri, 26 May 2023 20:32:53 -0700 Subject: [PATCH 001/103] test windows runner --- .github/workflows/main.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ae597fdf..6bbb29ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: ubuntu-latest + runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -29,13 +29,6 @@ jobs: run: uname - name: Set up MinGW uses: egor-tensin/setup-mingw@v2 - - name: Install wine - run: | - sudo dpkg --add-architecture i386 - wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - - sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport - sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main" - sudo apt install --install-recommends winehq-stable # Runs a set of commands using the runners shell - name: Run a multi-line script run: make release From 257ff91ae01c54b18ed9c47ae65e007961ce8e88 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 21:17:54 -0700 Subject: [PATCH 002/103] Add rsync --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6bbb29ed..e3b398c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,8 +27,13 @@ jobs: # Runs a single command using the runners shell - name: Run a one-line script run: uname + # Setup build functions - name: Set up MinGW uses: egor-tensin/setup-mingw@v2 + - name: Install Rsync + uses: crazy-max/ghaction-chocolatey@v2 + with: + args: install rsync # Runs a set of commands using the runners shell - name: Run a multi-line script run: make release From 2ccb25df559f98a3b8fed356f943c09951b3e033 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 21:45:01 -0700 Subject: [PATCH 003/103] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3b398c4..864bc88f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,10 +30,10 @@ jobs: # Setup build functions - name: Set up MinGW uses: egor-tensin/setup-mingw@v2 - - name: Install Rsync + - name: Install Tools uses: crazy-max/ghaction-chocolatey@v2 with: - args: install rsync + args: install rsync make # Runs a set of commands using the runners shell - name: Run a multi-line script run: make release From dd2744e16b776754b28b16f2cee8d06b790b1062 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 22:00:19 -0700 Subject: [PATCH 004/103] Update main.yml --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 864bc88f..6cce5dd0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,12 +28,12 @@ jobs: - name: Run a one-line script run: uname # Setup build functions - - name: Set up MinGW - uses: egor-tensin/setup-mingw@v2 + #- name: Set up MinGW + # uses: egor-tensin/setup-mingw@v2 - name: Install Tools uses: crazy-max/ghaction-chocolatey@v2 with: - args: install rsync make + args: install rsync make mingw # Runs a set of commands using the runners shell - name: Run a multi-line script run: make release From 803afa6d8e2f2c62843f4e8f1b238a1cf3d1a357 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 22:46:25 -0700 Subject: [PATCH 005/103] Update main.yml --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6cce5dd0..3ccc7650 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,12 @@ jobs: # Runs a single command using the runners shell - name: Run a one-line script - run: uname + run: | + uname + echo $PATH + echo %PATH% + which g++ + where g++ # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From ea8a919787388239a17987faf94db671e49ee54a Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:14:31 -0700 Subject: [PATCH 006/103] Update main.yml --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ccc7650..46c0e991 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,9 @@ jobs: build: # The type of runner that the job will run on runs-on: windows-latest - + defaults: + run: + shell: msys2 {0} # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it @@ -32,6 +34,8 @@ jobs: echo %PATH% which g++ where g++ + dir /c/ProgramData/Chocolatey/bin + ls /c/ProgramData/Chocolatey/bin/ # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From 4a5aa482b7f7b3e4759c68b93d7229e30702980f Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:29:45 -0700 Subject: [PATCH 007/103] Update main.yml --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 46c0e991..bf221cd4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,9 +18,6 @@ jobs: build: # The type of runner that the job will run on runs-on: windows-latest - defaults: - run: - shell: msys2 {0} # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it From 89b3937f352356ecee7cfc007ece7354639f1e28 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:34:53 -0700 Subject: [PATCH 008/103] Update main.yml --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bf221cd4..c861301f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,9 @@ jobs: where g++ dir /c/ProgramData/Chocolatey/bin ls /c/ProgramData/Chocolatey/bin/ + dir C:\ + dir "C:\Program Files" + dir "C:\Program Files (x86)" # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From 409ae733f94354082713902aaef6225f4736ddcb Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:36:02 -0700 Subject: [PATCH 009/103] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c861301f..2b00ef5b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: echo %PATH% which g++ where g++ - dir /c/ProgramData/Chocolatey/bin + dir C:\ProgramData\Chocolatey\bin ls /c/ProgramData/Chocolatey/bin/ dir C:\ dir "C:\Program Files" From c029b746de0c4b1123a041b3238e6ab888ee4012 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:45:25 -0700 Subject: [PATCH 010/103] Update main.yml --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b00ef5b..5ae939a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,6 @@ jobs: which g++ where g++ dir C:\ProgramData\Chocolatey\bin - ls /c/ProgramData/Chocolatey/bin/ dir C:\ dir "C:\Program Files" dir "C:\Program Files (x86)" From 60e34cb5f5b1e0277ec3e9ee7b9516e17668d89a Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:48:39 -0700 Subject: [PATCH 011/103] Update main.yml --- .github/workflows/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ae939a4..37c701ba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,16 @@ jobs: # The type of runner that the job will run on runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job + defaults: + run: + shell: msys2 {0} steps: + - uses: msys2/setup-msys2@v2 + with: + update: true + install: >- + base-devel + git # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 @@ -35,6 +44,7 @@ jobs: dir C:\ dir "C:\Program Files" dir "C:\Program Files (x86)" + dir "C:\Msys2" # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From 725ad0c6773df92b9491fe602cfff377fd74d172 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:06:13 -0700 Subject: [PATCH 012/103] Update main.yml --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 37c701ba..9192f156 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,13 +38,16 @@ jobs: uname echo $PATH echo %PATH% - which g++ - where g++ dir C:\ProgramData\Chocolatey\bin dir C:\ dir "C:\Program Files" dir "C:\Program Files (x86)" dir "C:\Msys2" + ls /mingw64/bin + ls /usr/local/bin + ls /usr/bin + ls /bin + # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From df8f9196345cd88303a040fe4b4307a490195b05 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:08:56 -0700 Subject: [PATCH 013/103] Update main.yml --- .github/workflows/main.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9192f156..17d6cc66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,16 +38,18 @@ jobs: uname echo $PATH echo %PATH% + ls /mingw64/bin + ls /usr/local/bin + ls /usr/bin + ls /bin + ls /c/Msys2 + - name: test windows + run: | dir C:\ProgramData\Chocolatey\bin dir C:\ dir "C:\Program Files" dir "C:\Program Files (x86)" dir "C:\Msys2" - ls /mingw64/bin - ls /usr/local/bin - ls /usr/bin - ls /bin - # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From d99e8f78c1ff01c7ae1bd87298bc777567eca0e0 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:11:57 -0700 Subject: [PATCH 014/103] Update main.yml --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17d6cc66..d5e29782 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,13 +38,15 @@ jobs: uname echo $PATH echo %PATH% + ls ls /mingw64/bin - ls /usr/local/bin + #ls /usr/local/bin ls /usr/bin ls /bin ls /c/Msys2 - name: test windows run: | + dir C:\ProgramData\Chocolatey dir C:\ProgramData\Chocolatey\bin dir C:\ dir "C:\Program Files" From 3d517f7867fa8c5f115ba22b24ed21031d52c0e7 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:14:49 -0700 Subject: [PATCH 015/103] Update main.yml --- .github/workflows/main.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5e29782..15468802 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,27 +23,7 @@ jobs: run: shell: msys2 {0} steps: - - uses: msys2/setup-msys2@v2 - with: - update: true - install: >- - base-devel - git - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - # Runs a single command using the runners shell - - name: Run a one-line script - run: | - uname - echo $PATH - echo %PATH% - ls - ls /mingw64/bin - #ls /usr/local/bin - ls /usr/bin - ls /bin - ls /c/Msys2 - name: test windows run: | dir C:\ProgramData\Chocolatey From 663a7255029e72fe5794915b038ae5d0418ceb06 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:16:55 -0700 Subject: [PATCH 016/103] Update main.yml --- .github/workflows/main.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 15468802..ecf83c14 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,24 @@ jobs: run: shell: msys2 {0} steps: + - uses: msys2/setup-msys2@v2 + with: + msystem: MINGW32 + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v3 + # Runs a single command using the runners shell + - name: Run a one-line script + run: | + uname + echo $PATH + echo %PATH% + ls + ls /mingw64/bin + #ls -al /usr/local/bin + ls -l /usr/bin + ls -l /bin + ls -l /c/Msys2 - name: test windows run: | dir C:\ProgramData\Chocolatey From 4c938bf719f9b3574bb5c0b41be3777510020636 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:19:03 -0700 Subject: [PATCH 017/103] Update main.yml --- .github/workflows/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ecf83c14..23d6fdba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,15 +40,15 @@ jobs: #ls -al /usr/local/bin ls -l /usr/bin ls -l /bin - ls -l /c/Msys2 - - name: test windows - run: | - dir C:\ProgramData\Chocolatey - dir C:\ProgramData\Chocolatey\bin - dir C:\ - dir "C:\Program Files" - dir "C:\Program Files (x86)" - dir "C:\Msys2" + # ls -l /c/Msys2 + #- name: test windows + # run: | + # dir C:\ProgramData\Chocolatey + # dir C:\ProgramData\Chocolatey\bin + # dir C:\ + # dir "C:\Program Files" + # dir "C:\Program Files (x86)" + # dir "C:\Msys2" # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From 75f14642e1ce4004495475a81f702b70b6b45d5b Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:20:49 -0700 Subject: [PATCH 018/103] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 23d6fdba..52cd72fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,7 @@ jobs: - uses: msys2/setup-msys2@v2 with: msystem: MINGW32 + path-type: inherit # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 From fdbd636fa33027a513c0642947df0bef36e57f47 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:22:37 -0700 Subject: [PATCH 019/103] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52cd72fb..3b0f8aeb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,6 +41,8 @@ jobs: #ls -al /usr/local/bin ls -l /usr/bin ls -l /bin + ls -l /mingw32/ + ls -l /mingw32/bin # ls -l /c/Msys2 #- name: test windows # run: | From 3d75e150d04544950da8ac655aca689a12a26f3e Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:29:17 -0700 Subject: [PATCH 020/103] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b0f8aeb..35dc0f53 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,6 +34,7 @@ jobs: - name: Run a one-line script run: | uname + pacman -S mingw-w64-i686-toolchain echo $PATH echo %PATH% ls From 0d764a48a0c3a1a2b64ba74cb9b856c69941338d Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:31:40 -0700 Subject: [PATCH 021/103] Update main.yml --- .github/workflows/main.yml | 48 ++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35dc0f53..7b94cf6e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,39 +20,41 @@ jobs: runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job defaults: - run: - shell: msys2 {0} + #run: + # shell: msys2 {0} steps: - - uses: msys2/setup-msys2@v2 - with: - msystem: MINGW32 - path-type: inherit + #- uses: msys2/setup-msys2@v2 + # with: + # msystem: MINGW32 + # path-type: inherit # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 # Runs a single command using the runners shell - - name: Run a one-line script - run: | - uname - pacman -S mingw-w64-i686-toolchain - echo $PATH - echo %PATH% - ls - ls /mingw64/bin - #ls -al /usr/local/bin - ls -l /usr/bin - ls -l /bin - ls -l /mingw32/ - ls -l /mingw32/bin - # ls -l /c/Msys2 - #- name: test windows + #- name: Run a one-line script # run: | - # dir C:\ProgramData\Chocolatey + # uname + # pacman -S mingw-w64-i686-toolchain + # pacman -Q | grep mingw + # echo $PATH + # echo %PATH% + # ls + # ls /mingw64/bin + # #ls -al /usr/local/bin + # ls -l /usr/bin + # ls -l /bin + # ls -l /mingw32/ + # ls -l /mingw32/bin + # ls -l /c/Msys2 + - name: test windows + run: | + dir "C:\Msys2" + dir C:\ProgramData\Chocolatey # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" # dir "C:\Program Files (x86)" - # dir "C:\Msys2" + # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From b54789813a17e7f5956ab7c2e8b93a0dae618d38 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:32:27 -0700 Subject: [PATCH 022/103] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b94cf6e..5e3848f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,8 +20,8 @@ jobs: runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job defaults: - #run: - # shell: msys2 {0} + run: + shell: bash.exe {0} steps: #- uses: msys2/setup-msys2@v2 # with: From 6db00b30e255bd0c83a3b2f3b5c9be6e9efe92ed Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:33:53 -0700 Subject: [PATCH 023/103] Update main.yml --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5e3848f5..fdf4ee84 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,9 +19,9 @@ jobs: # The type of runner that the job will run on runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job - defaults: - run: - shell: bash.exe {0} + #defaults: + # run: + # shell: bash.exe {0} steps: #- uses: msys2/setup-msys2@v2 # with: From 2f62c399ebe962a339ec103842013d4c5b661d54 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:35:07 -0700 Subject: [PATCH 024/103] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fdf4ee84..161edbb0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: # ls -l /c/Msys2 - name: test windows run: | - dir "C:\Msys2" + dir "C:\msys64" dir C:\ProgramData\Chocolatey # dir C:\ProgramData\Chocolatey\bin # dir C:\ From 8e7d0e0633ceb078266e42d1c02b41860f7b6ff0 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:39:28 -0700 Subject: [PATCH 025/103] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 161edbb0..4b45b945 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,6 +49,8 @@ jobs: - name: test windows run: | dir "C:\msys64" + dir "C:\msys64\mingw32" + dir "C:\msys64\mingw32\bin" dir C:\ProgramData\Chocolatey # dir C:\ProgramData\Chocolatey\bin # dir C:\ From ade96437ef1d4ba09e063801a2ac7d47f9e62134 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:44:46 -0700 Subject: [PATCH 026/103] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b45b945..f22fd042 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,6 +52,8 @@ jobs: dir "C:\msys64\mingw32" dir "C:\msys64\mingw32\bin" dir C:\ProgramData\Chocolatey + dir C:\ProgramData\chocolatey\lib\mingw\ + dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From ec8d207fc6646df8a60626b551f348e22f9aee30 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:46:13 -0700 Subject: [PATCH 027/103] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f22fd042..d9fb6f69 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,6 +54,8 @@ jobs: dir C:\ProgramData\Chocolatey dir C:\ProgramData\chocolatey\lib\mingw\ dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + choco install tree + tree C:\ProgramData\chocolatey\lib\mingw\tools\ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From b2670316414efa90f160491494ddc6679cfedc30 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:57:12 -0700 Subject: [PATCH 028/103] Update main.yml --- .github/workflows/main.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d9fb6f69..76fd5457 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,14 +48,15 @@ jobs: # ls -l /c/Msys2 - name: test windows run: | - dir "C:\msys64" - dir "C:\msys64\mingw32" - dir "C:\msys64\mingw32\bin" - dir C:\ProgramData\Chocolatey - dir C:\ProgramData\chocolatey\lib\mingw\ - dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin - choco install tree - tree C:\ProgramData\chocolatey\lib\mingw\tools\ + choco install winlibs --x86 + dir "C:\msys64" + dir "C:\msys64\mingw32" + dir "C:\msys64\mingw32\bin" + dir C:\ProgramData\Chocolatey\bin + dir C:\ProgramData\chocolatey\lib\mingw\ + dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + choco install tree + tree C:\ProgramData\chocolatey\lib\mingw\tools\ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From 25a9f44ae03b03bb43bf455ffe3dfc06516dedf6 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 01:02:39 -0700 Subject: [PATCH 029/103] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 76fd5457..9bf1a032 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,7 +56,7 @@ jobs: dir C:\ProgramData\chocolatey\lib\mingw\ dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin choco install tree - tree C:\ProgramData\chocolatey\lib\mingw\tools\ + tree C:\ProgramData\chocolatey\lib\ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From 484977a029aae04e0cdf22b65bb1ae8b4708262a Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 01:16:20 -0700 Subject: [PATCH 030/103] Update main.yml --- .github/workflows/main.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9bf1a032..5c0d1f0b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,9 +19,9 @@ jobs: # The type of runner that the job will run on runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job - #defaults: - # run: - # shell: bash.exe {0} + defaults: + run: + shell: bash.exe {0} steps: #- uses: msys2/setup-msys2@v2 # with: @@ -49,14 +49,16 @@ jobs: - name: test windows run: | choco install winlibs --x86 - dir "C:\msys64" - dir "C:\msys64\mingw32" - dir "C:\msys64\mingw32\bin" - dir C:\ProgramData\Chocolatey\bin - dir C:\ProgramData\chocolatey\lib\mingw\ - dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin - choco install tree - tree C:\ProgramData\chocolatey\lib\ + PATH=$PATH:/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin + PATH=$PATH:/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin + #dir "C:\msys64" + #dir "C:\msys64\mingw32" + #dir "C:\msys64\mingw32\bin" + #dir C:\ProgramData\Chocolatey\bin + #dir C:\ProgramData\chocolatey\lib\mingw\ + #dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + #choco install tree + #tree C:\ProgramData\chocolatey\lib\ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From 91ec847d89f4aa14a994d75225907f7595bed5bd Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 01:20:41 -0700 Subject: [PATCH 031/103] Update main.yml --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c0d1f0b..eda3a1f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,6 +59,11 @@ jobs: #dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin #choco install tree #tree C:\ProgramData\chocolatey\lib\ + - name: test windowaaaaaa + run: | + echo $PATH + echo %PATH% + ls -l /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From 994f764acf7294b92ad6c817ac1801bff1a83202 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 01:39:25 -0700 Subject: [PATCH 032/103] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eda3a1f0..afc4b221 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,8 +49,8 @@ jobs: - name: test windows run: | choco install winlibs --x86 - PATH=$PATH:/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin - PATH=$PATH:/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin + echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin" >> $GITHUB_PATH + echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin" >> $GITHUB_PATH #dir "C:\msys64" #dir "C:\msys64\mingw32" #dir "C:\msys64\mingw32\bin" From 8c86f0974149fccf1831f9684e6cc243b5fb8d9e Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:14:24 -0700 Subject: [PATCH 033/103] Update main.yml --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index afc4b221..14c3587a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,11 @@ jobs: # path-type: inherit # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 + # Update references + - name: Git Sumbodule Update + run: | + git pull --recurse-submodules + git submodule update --remote --recursive # Runs a single command using the runners shell #- name: Run a one-line script From 0dee38d09517337e758aa4819b996d30028a4aec Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:18:09 -0700 Subject: [PATCH 034/103] Update main.yml --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 14c3587a..69dc49b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,6 @@ jobs: # Update references - name: Git Sumbodule Update run: | - git pull --recurse-submodules git submodule update --remote --recursive # Runs a single command using the runners shell From 415e26b8c748b0418681065c3b181b695bf86435 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:30:44 -0700 Subject: [PATCH 035/103] Update main.yml --- .github/workflows/main.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69dc49b6..b3f257d5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,11 +29,16 @@ jobs: # path-type: inherit # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 + with: + submodules: true # Update references - - name: Git Sumbodule Update - run: | - git submodule update --remote --recursive - + #- name: Git Sumbodule Update + # run: | + # git submodule update --remote --recursive + - name: Cache choco packages + uses: actions/cache@v3 + with: + path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey\winlibs\ # Runs a single command using the runners shell #- name: Run a one-line script # run: | From 3c3f9feb6bfb18a29db1cb9041fda85b883a4894 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:32:23 -0700 Subject: [PATCH 036/103] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b3f257d5..32b3d4f1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,6 +38,7 @@ jobs: - name: Cache choco packages uses: actions/cache@v3 with: + key: key path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey\winlibs\ # Runs a single command using the runners shell #- name: Run a one-line script From c96874273d6d51615cb982019215a2f0e78d93f0 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:41:24 -0700 Subject: [PATCH 037/103] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 32b3d4f1..05a14160 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,5 +87,5 @@ jobs: with: args: install rsync make mingw # Runs a set of commands using the runners shell - - name: Run a multi-line script - run: make release + #- name: Run a multi-line script + # run: make release From 8f78eb723bcea49ec04bdd1c2c89a28f3f007645 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:56:18 -0700 Subject: [PATCH 038/103] Update main.yml --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 05a14160..5eca7f0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,6 +74,7 @@ jobs: echo $PATH echo %PATH% ls -l /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin + which i686-w64-mingw32-g++ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" @@ -87,5 +88,5 @@ jobs: with: args: install rsync make mingw # Runs a set of commands using the runners shell - #- name: Run a multi-line script - # run: make release + - name: Run a multi-line script + run: make release From ebb9fc8b1a606518c4ce9d8868723e9b74d53a51 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 15:58:19 -0700 Subject: [PATCH 039/103] test --- scripts/make_depend | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/make_depend b/scripts/make_depend index 5591972b..e066ef2e 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -17,6 +17,10 @@ if [ $? -ne 0 ]; then echo "Regenerating .depend_$branch" + echo "$1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0" + $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 + echo "$1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1" + $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 & \ $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 & \ $1 $2 -std=c++11 -MM tools/*.cpp > tmp_depend2 & \ From ddf68389db5226085ae13a176ac60f1252e9d273 Mon Sep 17 00:00:00 2001 From: Rhekar Date: Fri, 26 May 2023 20:32:53 -0700 Subject: [PATCH 040/103] test windows runner --- .github/workflows/main.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ae597fdf..6bbb29ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: ubuntu-latest + runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -29,13 +29,6 @@ jobs: run: uname - name: Set up MinGW uses: egor-tensin/setup-mingw@v2 - - name: Install wine - run: | - sudo dpkg --add-architecture i386 - wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - - sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport - sudo apt-add-repository "deb https://dl.winehq.org/wine-builds/ubuntu $(lsb_release -cs) main" - sudo apt install --install-recommends winehq-stable # Runs a set of commands using the runners shell - name: Run a multi-line script run: make release From 7e8b9e8c7e03e1f46a7cb1d4b7ed5f92b00a46af Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 21:17:54 -0700 Subject: [PATCH 041/103] Add rsync --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6bbb29ed..e3b398c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,8 +27,13 @@ jobs: # Runs a single command using the runners shell - name: Run a one-line script run: uname + # Setup build functions - name: Set up MinGW uses: egor-tensin/setup-mingw@v2 + - name: Install Rsync + uses: crazy-max/ghaction-chocolatey@v2 + with: + args: install rsync # Runs a set of commands using the runners shell - name: Run a multi-line script run: make release From df5772dde421d478d444db5f65f9b05c4a0de6ed Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 21:45:01 -0700 Subject: [PATCH 042/103] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3b398c4..864bc88f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,10 +30,10 @@ jobs: # Setup build functions - name: Set up MinGW uses: egor-tensin/setup-mingw@v2 - - name: Install Rsync + - name: Install Tools uses: crazy-max/ghaction-chocolatey@v2 with: - args: install rsync + args: install rsync make # Runs a set of commands using the runners shell - name: Run a multi-line script run: make release From c7bdf7561e712e6a5b2a8eff987ee703b86ed38b Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 22:00:19 -0700 Subject: [PATCH 043/103] Update main.yml --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 864bc88f..6cce5dd0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,12 +28,12 @@ jobs: - name: Run a one-line script run: uname # Setup build functions - - name: Set up MinGW - uses: egor-tensin/setup-mingw@v2 + #- name: Set up MinGW + # uses: egor-tensin/setup-mingw@v2 - name: Install Tools uses: crazy-max/ghaction-chocolatey@v2 with: - args: install rsync make + args: install rsync make mingw # Runs a set of commands using the runners shell - name: Run a multi-line script run: make release From a93c9b72b8cfc27fc60c2f004f403238796b89e3 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 22:46:25 -0700 Subject: [PATCH 044/103] Update main.yml --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6cce5dd0..3ccc7650 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,12 @@ jobs: # Runs a single command using the runners shell - name: Run a one-line script - run: uname + run: | + uname + echo $PATH + echo %PATH% + which g++ + where g++ # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From 78b50f6ba161400f15c91577dd07c7b821606c77 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:14:31 -0700 Subject: [PATCH 045/103] Update main.yml --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ccc7650..46c0e991 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,9 @@ jobs: build: # The type of runner that the job will run on runs-on: windows-latest - + defaults: + run: + shell: msys2 {0} # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it @@ -32,6 +34,8 @@ jobs: echo %PATH% which g++ where g++ + dir /c/ProgramData/Chocolatey/bin + ls /c/ProgramData/Chocolatey/bin/ # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From 4e3e35f94564521c396a96f40987b6fe32452abc Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:29:45 -0700 Subject: [PATCH 046/103] Update main.yml --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 46c0e991..bf221cd4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,9 +18,6 @@ jobs: build: # The type of runner that the job will run on runs-on: windows-latest - defaults: - run: - shell: msys2 {0} # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it From 8afffa47f3a0aa28f9ecc58c15027695e08d8e88 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:34:53 -0700 Subject: [PATCH 047/103] Update main.yml --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bf221cd4..c861301f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,6 +33,9 @@ jobs: where g++ dir /c/ProgramData/Chocolatey/bin ls /c/ProgramData/Chocolatey/bin/ + dir C:\ + dir "C:\Program Files" + dir "C:\Program Files (x86)" # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From d139dbf9c8aad52a2800283f9b140cde820609fd Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:36:02 -0700 Subject: [PATCH 048/103] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c861301f..2b00ef5b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: echo %PATH% which g++ where g++ - dir /c/ProgramData/Chocolatey/bin + dir C:\ProgramData\Chocolatey\bin ls /c/ProgramData/Chocolatey/bin/ dir C:\ dir "C:\Program Files" From 072b08528ba126aa0f4e07943b8db01a3ae195ff Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:45:25 -0700 Subject: [PATCH 049/103] Update main.yml --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b00ef5b..5ae939a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,6 @@ jobs: which g++ where g++ dir C:\ProgramData\Chocolatey\bin - ls /c/ProgramData/Chocolatey/bin/ dir C:\ dir "C:\Program Files" dir "C:\Program Files (x86)" From cdc86e761288943c4061e610740c822c25de1ec4 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Fri, 26 May 2023 23:48:39 -0700 Subject: [PATCH 050/103] Update main.yml --- .github/workflows/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ae939a4..37c701ba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,16 @@ jobs: # The type of runner that the job will run on runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job + defaults: + run: + shell: msys2 {0} steps: + - uses: msys2/setup-msys2@v2 + with: + update: true + install: >- + base-devel + git # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 @@ -35,6 +44,7 @@ jobs: dir C:\ dir "C:\Program Files" dir "C:\Program Files (x86)" + dir "C:\Msys2" # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From 2898ca51ffb81f7af8296d3f4667a1f3546553b6 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:06:13 -0700 Subject: [PATCH 051/103] Update main.yml --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 37c701ba..9192f156 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,13 +38,16 @@ jobs: uname echo $PATH echo %PATH% - which g++ - where g++ dir C:\ProgramData\Chocolatey\bin dir C:\ dir "C:\Program Files" dir "C:\Program Files (x86)" dir "C:\Msys2" + ls /mingw64/bin + ls /usr/local/bin + ls /usr/bin + ls /bin + # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From 3bb2f8c21fe18f0c0ba714db49ac7380ff9675a8 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:08:56 -0700 Subject: [PATCH 052/103] Update main.yml --- .github/workflows/main.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9192f156..17d6cc66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,16 +38,18 @@ jobs: uname echo $PATH echo %PATH% + ls /mingw64/bin + ls /usr/local/bin + ls /usr/bin + ls /bin + ls /c/Msys2 + - name: test windows + run: | dir C:\ProgramData\Chocolatey\bin dir C:\ dir "C:\Program Files" dir "C:\Program Files (x86)" dir "C:\Msys2" - ls /mingw64/bin - ls /usr/local/bin - ls /usr/bin - ls /bin - # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From eead0908b0957a74a8d9a836da15d57e8af24117 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:11:57 -0700 Subject: [PATCH 053/103] Update main.yml --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17d6cc66..d5e29782 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,13 +38,15 @@ jobs: uname echo $PATH echo %PATH% + ls ls /mingw64/bin - ls /usr/local/bin + #ls /usr/local/bin ls /usr/bin ls /bin ls /c/Msys2 - name: test windows run: | + dir C:\ProgramData\Chocolatey dir C:\ProgramData\Chocolatey\bin dir C:\ dir "C:\Program Files" From 7d5ec10161f2a7535a304d56b0dc12373b31333e Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:14:49 -0700 Subject: [PATCH 054/103] Update main.yml --- .github/workflows/main.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5e29782..15468802 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,27 +23,7 @@ jobs: run: shell: msys2 {0} steps: - - uses: msys2/setup-msys2@v2 - with: - update: true - install: >- - base-devel - git - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - # Runs a single command using the runners shell - - name: Run a one-line script - run: | - uname - echo $PATH - echo %PATH% - ls - ls /mingw64/bin - #ls /usr/local/bin - ls /usr/bin - ls /bin - ls /c/Msys2 - name: test windows run: | dir C:\ProgramData\Chocolatey From 7a678f5420feea419b568f6af84ab2e46b965d1d Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:16:55 -0700 Subject: [PATCH 055/103] Update main.yml --- .github/workflows/main.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 15468802..ecf83c14 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,24 @@ jobs: run: shell: msys2 {0} steps: + - uses: msys2/setup-msys2@v2 + with: + msystem: MINGW32 + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v3 + # Runs a single command using the runners shell + - name: Run a one-line script + run: | + uname + echo $PATH + echo %PATH% + ls + ls /mingw64/bin + #ls -al /usr/local/bin + ls -l /usr/bin + ls -l /bin + ls -l /c/Msys2 - name: test windows run: | dir C:\ProgramData\Chocolatey From d6b4215c13140509042d1c8d175b762f389e785c Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:19:03 -0700 Subject: [PATCH 056/103] Update main.yml --- .github/workflows/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ecf83c14..23d6fdba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,15 +40,15 @@ jobs: #ls -al /usr/local/bin ls -l /usr/bin ls -l /bin - ls -l /c/Msys2 - - name: test windows - run: | - dir C:\ProgramData\Chocolatey - dir C:\ProgramData\Chocolatey\bin - dir C:\ - dir "C:\Program Files" - dir "C:\Program Files (x86)" - dir "C:\Msys2" + # ls -l /c/Msys2 + #- name: test windows + # run: | + # dir C:\ProgramData\Chocolatey + # dir C:\ProgramData\Chocolatey\bin + # dir C:\ + # dir "C:\Program Files" + # dir "C:\Program Files (x86)" + # dir "C:\Msys2" # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From aa62ec617a1d59de79ffa1e9fb3d4a05f15e269c Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:20:49 -0700 Subject: [PATCH 057/103] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 23d6fdba..52cd72fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,7 @@ jobs: - uses: msys2/setup-msys2@v2 with: msystem: MINGW32 + path-type: inherit # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 From ebbe0b9a6280b6a629c0c8f4bea12ded4f65c7c0 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:22:37 -0700 Subject: [PATCH 058/103] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52cd72fb..3b0f8aeb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,6 +41,8 @@ jobs: #ls -al /usr/local/bin ls -l /usr/bin ls -l /bin + ls -l /mingw32/ + ls -l /mingw32/bin # ls -l /c/Msys2 #- name: test windows # run: | From f16d5a2c47712e99cdeca16341727139e7749ebb Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:29:17 -0700 Subject: [PATCH 059/103] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b0f8aeb..35dc0f53 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,6 +34,7 @@ jobs: - name: Run a one-line script run: | uname + pacman -S mingw-w64-i686-toolchain echo $PATH echo %PATH% ls From d10ba98a33ce8e4d7264c44acfd6180ac540b0f5 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:31:40 -0700 Subject: [PATCH 060/103] Update main.yml --- .github/workflows/main.yml | 48 ++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35dc0f53..7b94cf6e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,39 +20,41 @@ jobs: runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job defaults: - run: - shell: msys2 {0} + #run: + # shell: msys2 {0} steps: - - uses: msys2/setup-msys2@v2 - with: - msystem: MINGW32 - path-type: inherit + #- uses: msys2/setup-msys2@v2 + # with: + # msystem: MINGW32 + # path-type: inherit # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 # Runs a single command using the runners shell - - name: Run a one-line script - run: | - uname - pacman -S mingw-w64-i686-toolchain - echo $PATH - echo %PATH% - ls - ls /mingw64/bin - #ls -al /usr/local/bin - ls -l /usr/bin - ls -l /bin - ls -l /mingw32/ - ls -l /mingw32/bin - # ls -l /c/Msys2 - #- name: test windows + #- name: Run a one-line script # run: | - # dir C:\ProgramData\Chocolatey + # uname + # pacman -S mingw-w64-i686-toolchain + # pacman -Q | grep mingw + # echo $PATH + # echo %PATH% + # ls + # ls /mingw64/bin + # #ls -al /usr/local/bin + # ls -l /usr/bin + # ls -l /bin + # ls -l /mingw32/ + # ls -l /mingw32/bin + # ls -l /c/Msys2 + - name: test windows + run: | + dir "C:\Msys2" + dir C:\ProgramData\Chocolatey # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" # dir "C:\Program Files (x86)" - # dir "C:\Msys2" + # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 From d5ce71f9206ff3dcbf0a1960e016bb180898f86c Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:32:27 -0700 Subject: [PATCH 061/103] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b94cf6e..5e3848f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,8 +20,8 @@ jobs: runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job defaults: - #run: - # shell: msys2 {0} + run: + shell: bash.exe {0} steps: #- uses: msys2/setup-msys2@v2 # with: From f87d9ab1ce57d911ff2b5ad6397a262c48012926 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:33:53 -0700 Subject: [PATCH 062/103] Update main.yml --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5e3848f5..fdf4ee84 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,9 +19,9 @@ jobs: # The type of runner that the job will run on runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job - defaults: - run: - shell: bash.exe {0} + #defaults: + # run: + # shell: bash.exe {0} steps: #- uses: msys2/setup-msys2@v2 # with: From 0add0c32363341a320550aa8adc1d25700b53e08 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:35:07 -0700 Subject: [PATCH 063/103] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fdf4ee84..161edbb0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: # ls -l /c/Msys2 - name: test windows run: | - dir "C:\Msys2" + dir "C:\msys64" dir C:\ProgramData\Chocolatey # dir C:\ProgramData\Chocolatey\bin # dir C:\ From 9ed5a408c5945ff9f67efbcbbf6715b170411277 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:39:28 -0700 Subject: [PATCH 064/103] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 161edbb0..4b45b945 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,6 +49,8 @@ jobs: - name: test windows run: | dir "C:\msys64" + dir "C:\msys64\mingw32" + dir "C:\msys64\mingw32\bin" dir C:\ProgramData\Chocolatey # dir C:\ProgramData\Chocolatey\bin # dir C:\ From 48057a4e6d4b071d53424bf565b711cc1fb89c89 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:44:46 -0700 Subject: [PATCH 065/103] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b45b945..f22fd042 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,6 +52,8 @@ jobs: dir "C:\msys64\mingw32" dir "C:\msys64\mingw32\bin" dir C:\ProgramData\Chocolatey + dir C:\ProgramData\chocolatey\lib\mingw\ + dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From 84f668b245c884b71b2ee2d1ef52fe5615e3d658 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:46:13 -0700 Subject: [PATCH 066/103] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f22fd042..d9fb6f69 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,6 +54,8 @@ jobs: dir C:\ProgramData\Chocolatey dir C:\ProgramData\chocolatey\lib\mingw\ dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + choco install tree + tree C:\ProgramData\chocolatey\lib\mingw\tools\ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From 5bc186fdfb9212ef993aa53ac97858429160af2a Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 00:57:12 -0700 Subject: [PATCH 067/103] Update main.yml --- .github/workflows/main.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d9fb6f69..76fd5457 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,14 +48,15 @@ jobs: # ls -l /c/Msys2 - name: test windows run: | - dir "C:\msys64" - dir "C:\msys64\mingw32" - dir "C:\msys64\mingw32\bin" - dir C:\ProgramData\Chocolatey - dir C:\ProgramData\chocolatey\lib\mingw\ - dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin - choco install tree - tree C:\ProgramData\chocolatey\lib\mingw\tools\ + choco install winlibs --x86 + dir "C:\msys64" + dir "C:\msys64\mingw32" + dir "C:\msys64\mingw32\bin" + dir C:\ProgramData\Chocolatey\bin + dir C:\ProgramData\chocolatey\lib\mingw\ + dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + choco install tree + tree C:\ProgramData\chocolatey\lib\mingw\tools\ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From 48089f4e20f66d8f295f2bfd2973da17f0932847 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 01:02:39 -0700 Subject: [PATCH 068/103] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 76fd5457..9bf1a032 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,7 +56,7 @@ jobs: dir C:\ProgramData\chocolatey\lib\mingw\ dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin choco install tree - tree C:\ProgramData\chocolatey\lib\mingw\tools\ + tree C:\ProgramData\chocolatey\lib\ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From be4c0a20c6e7fee6031ea5aad5b7ab97d2cbffcb Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 01:16:20 -0700 Subject: [PATCH 069/103] Update main.yml --- .github/workflows/main.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9bf1a032..5c0d1f0b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,9 +19,9 @@ jobs: # The type of runner that the job will run on runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job - #defaults: - # run: - # shell: bash.exe {0} + defaults: + run: + shell: bash.exe {0} steps: #- uses: msys2/setup-msys2@v2 # with: @@ -49,14 +49,16 @@ jobs: - name: test windows run: | choco install winlibs --x86 - dir "C:\msys64" - dir "C:\msys64\mingw32" - dir "C:\msys64\mingw32\bin" - dir C:\ProgramData\Chocolatey\bin - dir C:\ProgramData\chocolatey\lib\mingw\ - dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin - choco install tree - tree C:\ProgramData\chocolatey\lib\ + PATH=$PATH:/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin + PATH=$PATH:/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin + #dir "C:\msys64" + #dir "C:\msys64\mingw32" + #dir "C:\msys64\mingw32\bin" + #dir C:\ProgramData\Chocolatey\bin + #dir C:\ProgramData\chocolatey\lib\mingw\ + #dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + #choco install tree + #tree C:\ProgramData\chocolatey\lib\ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From 9e3b565396b50234b21f5af78fceb8cf0358ceb2 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 01:20:41 -0700 Subject: [PATCH 070/103] Update main.yml --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c0d1f0b..eda3a1f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,6 +59,11 @@ jobs: #dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin #choco install tree #tree C:\ProgramData\chocolatey\lib\ + - name: test windowaaaaaa + run: | + echo $PATH + echo %PATH% + ls -l /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" From a92881e8602a0fe5dbbcb481ab0081c56a3c82b1 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 01:39:25 -0700 Subject: [PATCH 071/103] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eda3a1f0..afc4b221 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,8 +49,8 @@ jobs: - name: test windows run: | choco install winlibs --x86 - PATH=$PATH:/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin - PATH=$PATH:/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin + echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin" >> $GITHUB_PATH + echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin" >> $GITHUB_PATH #dir "C:\msys64" #dir "C:\msys64\mingw32" #dir "C:\msys64\mingw32\bin" From f4b7791b1732df4d4b60be64aabe4de8ae1d0d18 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:14:24 -0700 Subject: [PATCH 072/103] Update main.yml --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index afc4b221..14c3587a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,11 @@ jobs: # path-type: inherit # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 + # Update references + - name: Git Sumbodule Update + run: | + git pull --recurse-submodules + git submodule update --remote --recursive # Runs a single command using the runners shell #- name: Run a one-line script From 7e2264686833d94a51c72c63c991ec87fa32e7e5 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:18:09 -0700 Subject: [PATCH 073/103] Update main.yml --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 14c3587a..69dc49b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,6 @@ jobs: # Update references - name: Git Sumbodule Update run: | - git pull --recurse-submodules git submodule update --remote --recursive # Runs a single command using the runners shell From 21b38c760d3ceb29da6df4562575f325246878ac Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:30:44 -0700 Subject: [PATCH 074/103] Update main.yml --- .github/workflows/main.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69dc49b6..b3f257d5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,11 +29,16 @@ jobs: # path-type: inherit # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 + with: + submodules: true # Update references - - name: Git Sumbodule Update - run: | - git submodule update --remote --recursive - + #- name: Git Sumbodule Update + # run: | + # git submodule update --remote --recursive + - name: Cache choco packages + uses: actions/cache@v3 + with: + path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey\winlibs\ # Runs a single command using the runners shell #- name: Run a one-line script # run: | From 843687badbe096d6e803fc1c59618d9d0f66784f Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:32:23 -0700 Subject: [PATCH 075/103] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b3f257d5..32b3d4f1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,6 +38,7 @@ jobs: - name: Cache choco packages uses: actions/cache@v3 with: + key: key path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey\winlibs\ # Runs a single command using the runners shell #- name: Run a one-line script From e42c2a7d15a8837dfa3b54e70b3991acc81e0058 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:41:24 -0700 Subject: [PATCH 076/103] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 32b3d4f1..05a14160 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,5 +87,5 @@ jobs: with: args: install rsync make mingw # Runs a set of commands using the runners shell - - name: Run a multi-line script - run: make release + #- name: Run a multi-line script + # run: make release From 01e6aa1bcdf1796fca8fbdf9319552db491e9768 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 02:56:18 -0700 Subject: [PATCH 077/103] Update main.yml --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 05a14160..5eca7f0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,6 +74,7 @@ jobs: echo $PATH echo %PATH% ls -l /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin + which i686-w64-mingw32-g++ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" @@ -87,5 +88,5 @@ jobs: with: args: install rsync make mingw # Runs a set of commands using the runners shell - #- name: Run a multi-line script - # run: make release + - name: Run a multi-line script + run: make release From aee661980e202b1e8dc608662271d06fcdac6f57 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 27 May 2023 15:58:19 -0700 Subject: [PATCH 078/103] test --- scripts/make_depend | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/make_depend b/scripts/make_depend index 5591972b..e066ef2e 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -17,6 +17,10 @@ if [ $? -ne 0 ]; then echo "Regenerating .depend_$branch" + echo "$1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0" + $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 + echo "$1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1" + $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 & \ $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 & \ $1 $2 -std=c++11 -MM tools/*.cpp > tmp_depend2 & \ From bb52fd5f46270b495f2b7a5fe7133debdbca6d16 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 15 Jul 2023 11:55:17 -0700 Subject: [PATCH 079/103] Update main.yml --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5eca7f0a..6fdd2fbd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,3 +90,8 @@ jobs: # Runs a set of commands using the runners shell - name: Run a multi-line script run: make release + # post debug + - name: Post Debug + run: | + dir + cat .depend_master From 35b0d3df0b96da3ee7dfca77d87bd5be3203a79f Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 15 Jul 2023 12:20:13 -0700 Subject: [PATCH 080/103] test --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index b0e7ee9f..f55eb8a9 100644 --- a/Makefile +++ b/Makefile @@ -404,6 +404,8 @@ endif pre-build: $(make_version) $(make_protocol) + dir + cat .depend_master @echo @echo ========== Main-build ========== @echo From ef7c3cbfdd9dab54853db6aa50eed02f982feee9 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sat, 15 Jul 2023 13:11:49 -0700 Subject: [PATCH 081/103] Update Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f55eb8a9..70ae1c16 100644 --- a/Makefile +++ b/Makefile @@ -404,11 +404,11 @@ endif pre-build: $(make_version) $(make_protocol) - dir - cat .depend_master @echo @echo ========== Main-build ========== @echo + dir /a:h + cat .depend_master post-build: main-build @echo From dde026844dddd19ba9cf28761c6decb319bba0ab Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 01:45:08 -0700 Subject: [PATCH 082/103] Update make_depend --- scripts/make_depend | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/make_depend b/scripts/make_depend index e066ef2e..239df52f 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -20,6 +20,7 @@ if [ $? -ne 0 ]; then echo "$1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0" $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 echo "$1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1" + cat tmp_depend1 $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 & \ $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 & \ From 741c8bfe7ee65099fba30a728bcc2b4f78a69aef Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 03:16:24 -0700 Subject: [PATCH 083/103] Update make_depend --- scripts/make_depend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/make_depend b/scripts/make_depend index 239df52f..89586057 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -20,7 +20,7 @@ if [ $? -ne 0 ]; then echo "$1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0" $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 echo "$1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1" - cat tmp_depend1 + cat tmp_depend0 $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 & \ $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 & \ From 2ee94b7bef97c754e6d74ba48c075bd8895b3b0d Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 17:30:38 -0700 Subject: [PATCH 084/103] Update make_depend --- scripts/make_depend | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/make_depend b/scripts/make_depend index 89586057..e8eb4e6f 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -28,7 +28,9 @@ if [ $? -ne 0 ]; then $1 $2 -std=c++11 -MM targets/*.cpp targets/*.hpp > tmp_depend3 & \ $1 $2 -std=c++11 -MM lib/*.cpp lib/*.hpp > tmp_depend4 & \ $1 $2 -std=c++11 -MM tests/*.cpp tests/*.hpp > tmp_depend5 - + + cat tmp_depend1 + cat tmp_depend2 wait cp /dev/null .depend_$branch @@ -41,7 +43,7 @@ if [ $? -ne 0 ]; then sed -r "s/^([A-Za-z.]+\.o\: )/$type\/lib\/\1/" tmp_depend4 >> .depend_$branch sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tests\/\1/" tmp_depend5 >> .depend_$branch done - + cat .depend_$branch rm -f tmp_depend* exit 0 From e345625faaae081ac72be49061080ab69a357910 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 20:00:31 -0700 Subject: [PATCH 085/103] Update make_depend --- scripts/make_depend | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/make_depend b/scripts/make_depend index e8eb4e6f..0eb2115c 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -36,13 +36,14 @@ if [ $? -ne 0 ]; then cp /dev/null .depend_$branch for type in build_debug_$branch build_release_$branch build_logging_$branch; do - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/sequences\/\1/" tmp_depend0 >> .depend_$branch - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/netplay\/\1/" tmp_depend1 >> .depend_$branch - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tools\/\1/" tmp_depend2 >> .depend_$branch - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/targets\/\1/" tmp_depend3 >> .depend_$branch - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/lib\/\1/" tmp_depend4 >> .depend_$branch - sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tests\/\1/" tmp_depend5 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/sequences\/\1/;s/\\\:/:/g" tmp_depend0 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/netplay\/\1/;s/\\\:/:/g" tmp_depend1 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tools\/\1/;s/\\\:/:/g" tmp_depend2 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/targets\/\1/;s/\\\:/:/g" tmp_depend3 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/lib\/\1/;s/\\\:/:/g" tmp_depend4 >> .depend_$branch + sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tests\/\1/;s/\\\:/:/g" tmp_depend5 >> .depend_$branch done + echo "AAAAA" cat .depend_$branch rm -f tmp_depend* From a8d32800fd9d97e3af4cb1c238333f30195d3059 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 20:03:58 -0700 Subject: [PATCH 086/103] Update Makefile --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 70ae1c16..b0e7ee9f 100644 --- a/Makefile +++ b/Makefile @@ -407,8 +407,6 @@ pre-build: @echo @echo ========== Main-build ========== @echo - dir /a:h - cat .depend_master post-build: main-build @echo From 57dbe085ca3fbda8db477197f9e54f0fa029a0be Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 21:55:06 -0700 Subject: [PATCH 087/103] Update main.yml --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6fdd2fbd..8ca895bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -89,7 +89,9 @@ jobs: args: install rsync make mingw # Runs a set of commands using the runners shell - name: Run a multi-line script - run: make release + run: | + which i686-w64-mingw32-g++ + make release # post debug - name: Post Debug run: | From e9c5a84c3cc14d039366882746cfc6de52c71da2 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 22:18:14 -0700 Subject: [PATCH 088/103] Update Makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index b0e7ee9f..4caa85cf 100644 --- a/Makefile +++ b/Makefile @@ -407,6 +407,7 @@ pre-build: @echo @echo ========== Main-build ========== @echo + @echo $$PATH post-build: main-build @echo From 851cad26c602166ecdfcc3bd21d6b622899c9357 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 22:22:36 -0700 Subject: [PATCH 089/103] Update Makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 4caa85cf..4f8d2ccf 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +PATH := $(PATH) VERSION = 3.1 SUFFIX = .004 NAME = cccaster From 8ab9de45aa6b4884a6271e8007c43e4a477603cb Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 22:23:40 -0700 Subject: [PATCH 090/103] Update make_depend --- scripts/make_depend | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/make_depend b/scripts/make_depend index 0eb2115c..2242139d 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -29,8 +29,6 @@ if [ $? -ne 0 ]; then $1 $2 -std=c++11 -MM lib/*.cpp lib/*.hpp > tmp_depend4 & \ $1 $2 -std=c++11 -MM tests/*.cpp tests/*.hpp > tmp_depend5 - cat tmp_depend1 - cat tmp_depend2 wait cp /dev/null .depend_$branch @@ -43,8 +41,6 @@ if [ $? -ne 0 ]; then sed -r "s/^([A-Za-z.]+\.o\: )/$type\/lib\/\1/;s/\\\:/:/g" tmp_depend4 >> .depend_$branch sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tests\/\1/;s/\\\:/:/g" tmp_depend5 >> .depend_$branch done - echo "AAAAA" - cat .depend_$branch rm -f tmp_depend* exit 0 From a1963914eca6e0cbe5dd4eb9a5d788772f8af7b2 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 22:24:05 -0700 Subject: [PATCH 091/103] Update make_depend --- scripts/make_depend | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/make_depend b/scripts/make_depend index 2242139d..1cec2a47 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -17,18 +17,13 @@ if [ $? -ne 0 ]; then echo "Regenerating .depend_$branch" - echo "$1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0" - $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 - echo "$1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1" - cat tmp_depend0 $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 & \ $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 & \ $1 $2 -std=c++11 -MM tools/*.cpp > tmp_depend2 & \ $1 $2 -std=c++11 -MM targets/*.cpp targets/*.hpp > tmp_depend3 & \ $1 $2 -std=c++11 -MM lib/*.cpp lib/*.hpp > tmp_depend4 & \ - $1 $2 -std=c++11 -MM tests/*.cpp tests/*.hpp > tmp_depend5 - + $1 $2 -std=c++11 -MM tests/*.cpp tests/*.hpp > tmp_depend5 wait cp /dev/null .depend_$branch @@ -41,6 +36,7 @@ if [ $? -ne 0 ]; then sed -r "s/^([A-Za-z.]+\.o\: )/$type\/lib\/\1/;s/\\\:/:/g" tmp_depend4 >> .depend_$branch sed -r "s/^([A-Za-z.]+\.o\: )/$type\/tests\/\1/;s/\\\:/:/g" tmp_depend5 >> .depend_$branch done + rm -f tmp_depend* exit 0 From f20bdf1caa7813c403cb4e78d01435f121a7c914 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 22:24:38 -0700 Subject: [PATCH 092/103] Update make_depend --- scripts/make_depend | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/make_depend b/scripts/make_depend index 1cec2a47..57605ce0 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -17,13 +17,12 @@ if [ $? -ne 0 ]; then echo "Regenerating .depend_$branch" - $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 $1 $2 -std=c++11 -MM sequences/*.cpp sequences/*.hpp > tmp_depend0 & \ $1 $2 -std=c++11 -MM netplay/*.cpp netplay/*.hpp > tmp_depend1 & \ $1 $2 -std=c++11 -MM tools/*.cpp > tmp_depend2 & \ $1 $2 -std=c++11 -MM targets/*.cpp targets/*.hpp > tmp_depend3 & \ $1 $2 -std=c++11 -MM lib/*.cpp lib/*.hpp > tmp_depend4 & \ - $1 $2 -std=c++11 -MM tests/*.cpp tests/*.hpp > tmp_depend5 + $1 $2 -std=c++11 -MM tests/*.cpp tests/*.hpp > tmp_depend5 wait cp /dev/null .depend_$branch From 8023f36f3d51f3629f662e6dfe5950527009bc31 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 22:24:49 -0700 Subject: [PATCH 093/103] Update make_depend --- scripts/make_depend | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/make_depend b/scripts/make_depend index 57605ce0..a01b6bce 100755 --- a/scripts/make_depend +++ b/scripts/make_depend @@ -23,6 +23,7 @@ if [ $? -ne 0 ]; then $1 $2 -std=c++11 -MM targets/*.cpp targets/*.hpp > tmp_depend3 & \ $1 $2 -std=c++11 -MM lib/*.cpp lib/*.hpp > tmp_depend4 & \ $1 $2 -std=c++11 -MM tests/*.cpp tests/*.hpp > tmp_depend5 + wait cp /dev/null .depend_$branch From ee7d2114e9d782db53a9c1eb88b137c74121bf96 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 22:38:02 -0700 Subject: [PATCH 094/103] Update Makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 4f8d2ccf..1232a9ee 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +SHELL := /bin/bash PATH := $(PATH) VERSION = 3.1 SUFFIX = .004 From 9214ecea92b2020723b21de7d530f0efb344377a Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 23:04:10 -0700 Subject: [PATCH 095/103] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8ca895bf..16c7ab07 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: run: | choco install winlibs --x86 echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin" >> $GITHUB_PATH - echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin" >> $GITHUB_PATH + #echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin" >> $GITHUB_PATH #dir "C:\msys64" #dir "C:\msys64\mingw32" #dir "C:\msys64\mingw32\bin" From a5d354b4dae2f1d3d95590316d859fb443a369b8 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 23:27:40 -0700 Subject: [PATCH 096/103] Update Makefile --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 1232a9ee..ed3aa5c8 100644 --- a/Makefile +++ b/Makefile @@ -410,6 +410,10 @@ pre-build: @echo ========== Main-build ========== @echo @echo $$PATH + dir + cp /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin/i686-w64-mingw32-g++ . + dir + i686-w64-mingw32-g++ post-build: main-build @echo From 075f22709178456b2e700dca8b050dc1ca3cc058 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 23:41:31 -0700 Subject: [PATCH 097/103] Update Makefile --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index ed3aa5c8..53b6f21e 100644 --- a/Makefile +++ b/Makefile @@ -413,7 +413,6 @@ pre-build: dir cp /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin/i686-w64-mingw32-g++ . dir - i686-w64-mingw32-g++ post-build: main-build @echo From 324ac6d1a4e969419ef8e879290b5d34d6cf0dd1 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 23:46:09 -0700 Subject: [PATCH 098/103] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 53b6f21e..1186d44c 100644 --- a/Makefile +++ b/Makefile @@ -411,7 +411,7 @@ pre-build: @echo @echo $$PATH dir - cp /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin/i686-w64-mingw32-g++ . + /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin/i686-w64-mingw32-g++ dir post-build: main-build From dd6b0bc98e69ef9f68a657326a501b3a1f1d9024 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 23:50:35 -0700 Subject: [PATCH 099/103] Update Makefile --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1186d44c..cb7c347b 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ MAIN_OBJECTS = $(MAIN_CPP_SRCS:.cpp=.o) $(CONTRIB_CC_SRCS:.cc=.o) $(CONTRIB_CPP_ DLL_OBJECTS = $(DLL_CPP_SRCS:.cpp=.o) $(HOOK_CC_SRCS:.cc=.o) $(HOOK_C_SRCS:.c=.o) $(CONTRIB_C_SRCS:.c=.o) $(CONTRIB_CPP_SRCS:.cpp=.o) # Tool chain -PREFIX = i686-w64-mingw32- +PREFIX = /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin/i686-w64-mingw32- GCC = $(PREFIX)gcc CXX = $(PREFIX)g++ WINDRES = windres @@ -411,7 +411,6 @@ pre-build: @echo @echo $$PATH dir - /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin/i686-w64-mingw32-g++ dir post-build: main-build From 5e48c54982af4a495d1d96f8f4e0815a9731e457 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Sun, 16 Jul 2023 23:56:49 -0700 Subject: [PATCH 100/103] Update main.yml --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 16c7ab07..d075573b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,9 +19,9 @@ jobs: # The type of runner that the job will run on runs-on: windows-latest # Steps represent a sequence of tasks that will be executed as part of the job - defaults: - run: - shell: bash.exe {0} + #defaults: + # run: + # shell: bash.exe {0} steps: #- uses: msys2/setup-msys2@v2 # with: @@ -91,7 +91,7 @@ jobs: - name: Run a multi-line script run: | which i686-w64-mingw32-g++ - make release + make release -i # post debug - name: Post Debug run: | From f25b08a001959144be991ff6cbc3b79260b47e4d Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Mon, 17 Jul 2023 00:10:47 -0700 Subject: [PATCH 101/103] Update main.yml --- .github/workflows/main.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d075573b..6cff35e8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,6 +59,7 @@ jobs: - name: test windows run: | choco install winlibs --x86 + choco install rsync make echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin" >> $GITHUB_PATH #echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin" >> $GITHUB_PATH #dir "C:\msys64" @@ -69,12 +70,12 @@ jobs: #dir C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin #choco install tree #tree C:\ProgramData\chocolatey\lib\ - - name: test windowaaaaaa - run: | - echo $PATH - echo %PATH% - ls -l /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin - which i686-w64-mingw32-g++ + #- name: test windowaaaaaa + # run: | + # echo $PATH + # echo %PATH% + # ls -l /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin + # which i686-w64-mingw32-g++ # dir C:\ProgramData\Chocolatey\bin # dir C:\ # dir "C:\Program Files" @@ -83,17 +84,17 @@ jobs: # Setup build functions #- name: Set up MinGW # uses: egor-tensin/setup-mingw@v2 - - name: Install Tools - uses: crazy-max/ghaction-chocolatey@v2 - with: - args: install rsync make mingw + #- name: Install Tools + # uses: crazy-max/ghaction-chocolatey@v2 + # with: + # args: install rsync make mingw # Runs a set of commands using the runners shell - name: Run a multi-line script run: | which i686-w64-mingw32-g++ make release -i # post debug - - name: Post Debug - run: | - dir - cat .depend_master + #- name: Post Debug + # run: | + # dir + # cat .depend_master From a921bce0b6978dc026cd56de170949f9ffc40da7 Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Mon, 17 Jul 2023 00:57:52 -0700 Subject: [PATCH 102/103] ubuntu --- .github/workflows/main.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6cff35e8..7bebc1bd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: windows-latest + runs-on: ubuntu-latest # Steps represent a sequence of tasks that will be executed as part of the job #defaults: # run: @@ -35,11 +35,11 @@ jobs: #- name: Git Sumbodule Update # run: | # git submodule update --remote --recursive - - name: Cache choco packages - uses: actions/cache@v3 - with: - key: key - path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey\winlibs\ + #- name: Cache choco packages + # uses: actions/cache@v3 + # with: + # key: key + # path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey\winlibs\ # Runs a single command using the runners shell #- name: Run a one-line script # run: | @@ -56,11 +56,16 @@ jobs: # ls -l /mingw32/ # ls -l /mingw32/bin # ls -l /c/Msys2 + - name: Set up MinGW + uses: egor-tensin/setup-mingw@v2 + with: + platform: x86 - name: test windows run: | - choco install winlibs --x86 - choco install rsync make - echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin" >> $GITHUB_PATH + echo $PATH + #choco install winlibs --x86 + #choco install rsync make + #echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin" >> $GITHUB_PATH #echo "/c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/i686-w64-mingw32/bin" >> $GITHUB_PATH #dir "C:\msys64" #dir "C:\msys64\mingw32" From 4e8fe3d0f735e4c56fc9d226c72d49173904cbbb Mon Sep 17 00:00:00 2001 From: Rhekar <35650467+Rhekar@users.noreply.github.com> Date: Mon, 17 Jul 2023 01:00:04 -0700 Subject: [PATCH 103/103] Update Makefile --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cb7c347b..c962efc7 100644 --- a/Makefile +++ b/Makefile @@ -56,6 +56,7 @@ DLL_OBJECTS = $(DLL_CPP_SRCS:.cpp=.o) $(HOOK_CC_SRCS:.cc=.o) $(HOOK_C_SRCS:.c=.o # Tool chain PREFIX = /c/ProgramData/chocolatey/lib/winlibs/tools/mingw32/bin/i686-w64-mingw32- +PREFIX = i686-w64-mingw32- GCC = $(PREFIX)gcc CXX = $(PREFIX)g++ WINDRES = windres @@ -409,9 +410,6 @@ pre-build: @echo @echo ========== Main-build ========== @echo - @echo $$PATH - dir - dir post-build: main-build @echo