From 12d03ad128bc7a0ec697bc5215862d9c838f4c9b Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sat, 18 May 2024 18:25:56 -0400 Subject: [PATCH 01/11] Update build-test.yml --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e0dd7c1778..7ad841c7bd 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -2,7 +2,7 @@ name: Build, Test & Release on: push: - branches: [ master ] + branches: [ master ] # s pull_request: branches: [ master ] From 86386dc38cdb665b9b96da0a39fe86a92e0c4dad Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sat, 18 May 2024 18:52:04 -0400 Subject: [PATCH 02/11] try 1 --- .github/workflows/build-test.yml | 8 +++++++- Tools/clean_logs.py | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 Tools/clean_logs.py diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 7ad841c7bd..e9182b0eb4 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -2,7 +2,7 @@ name: Build, Test & Release on: push: - branches: [ master ] # s + branches: [ master ] pull_request: branches: [ master ] @@ -49,6 +49,11 @@ jobs: - name: Publish DMCompiler if: github.event_name == 'push' run: dotnet publish DMCompiler -c Release -o output/DMCompiler_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} + - name: Clean logs + if: github.event_name == 'push' + run: | + python ./Tools/clean_logs.py output/DMCompiler_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} + python ./Tools/clean_logs.py output/OpenDreamServer_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} - name: Gzip releases if: github.event_name == 'push' run: | @@ -80,3 +85,4 @@ jobs: title: "Development Build" files: | artifacts/*/*.tar.gz + diff --git a/Tools/clean_logs.py b/Tools/clean_logs.py new file mode 100644 index 0000000000..06bce27ea9 --- /dev/null +++ b/Tools/clean_logs.py @@ -0,0 +1,19 @@ +import sys +import re + +if __name__ == "__main__": + log_files = sys.argv[1:] + seen = set() + lines = [] + + warning_pattern = re.compile(r'##\[warning\].*') # catch warnings might want to catch errors? + + for log_file in log_files: + with open(log_file, 'w+') as log: + for line in log: + if warning_pattern.search(line): + if line not in seen: + seen.add(line) + log.write(line) + else: + log.write(line) From 956f9cf1c3fde9f20f2fbec73cae32a4a5ca8ce8 Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sat, 18 May 2024 19:02:08 -0400 Subject: [PATCH 03/11] remove dodgy behaviour --- Tools/clean_logs.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Tools/clean_logs.py b/Tools/clean_logs.py index 06bce27ea9..e7e8d1c265 100644 --- a/Tools/clean_logs.py +++ b/Tools/clean_logs.py @@ -9,11 +9,13 @@ warning_pattern = re.compile(r'##\[warning\].*') # catch warnings might want to catch errors? for log_file in log_files: - with open(log_file, 'w+') as log: - for line in log: + with open(log_file, 'r') as log_in: + lines = log_in.readlines() + with open(log_file, 'w') as log_out: + for line in lines: if warning_pattern.search(line): if line not in seen: seen.add(line) - log.write(line) - else: - log.write(line) + log_out.write(line) + continue + log_out.write(line) From bd94a85e083dc5f161b6f14d10a643f6de6b39e4 Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sat, 18 May 2024 19:27:41 -0400 Subject: [PATCH 04/11] artifact output test --- .github/workflows/build-test.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e9182b0eb4..f1ef92ed50 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -49,11 +49,6 @@ jobs: - name: Publish DMCompiler if: github.event_name == 'push' run: dotnet publish DMCompiler -c Release -o output/DMCompiler_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} - - name: Clean logs - if: github.event_name == 'push' - run: | - python ./Tools/clean_logs.py output/DMCompiler_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} - python ./Tools/clean_logs.py output/OpenDreamServer_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} - name: Gzip releases if: github.event_name == 'push' run: | @@ -61,11 +56,22 @@ jobs: tar -czvf output/OpenDreamServer_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }}.tar.gz -C output OpenDreamServer_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} - name: Upload artifact if: github.event_name == 'push' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact/merge@v4 with: - name: build-${{ matrix.os }} - path: output/*.tar.gz + name: build-all retention-days: 1 + delete-merged: true + path: output/*.tar.gz + + #clean: + # needs: build + # runs-on: ubuntu-latest + # - name: Clean logs + # if: github.event_name == 'push' + # run: | + # python ./Tools/clean_logs.py output/DMCompiler_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} + # python ./Tools/clean_logs.py output/OpenDreamServer_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} + release: needs: build From 56129545b6f8d014a2750e4c8c87f74285b620ba Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sat, 18 May 2024 19:41:45 -0400 Subject: [PATCH 05/11] hopefully this aggerates the logs --- .github/workflows/build-test.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index f1ef92ed50..85c290c68a 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -32,7 +32,13 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore /m + run: dotnet build --configuration Release --no-restore /m > logs/log-${{ matrix.os }}.txt + - name: Upload log artifacts + uses: actions/upload-artifact/merge@v4 + with: + name: build-all + retention-days: 1 + delete-merged: true - name: Content.Tests shell: pwsh run: | @@ -56,12 +62,11 @@ jobs: tar -czvf output/OpenDreamServer_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }}.tar.gz -C output OpenDreamServer_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} - name: Upload artifact if: github.event_name == 'push' - uses: actions/upload-artifact/merge@v4 + uses: actions/upload-artifact@v3 with: - name: build-all - retention-days: 1 - delete-merged: true + name: build-${{ matrix.os }} path: output/*.tar.gz + retention-days: 1 #clean: # needs: build From 09e6ebf20a0035650ea390fe4cdb40250ed8704b Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sat, 18 May 2024 19:45:38 -0400 Subject: [PATCH 06/11] Update build-test.yml --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 85c290c68a..70419d258c 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore /m > logs/log-${{ matrix.os }}.txt + run: dotnet build --configuration Release --no-restore /m > log-${{ matrix.os }}.txt - name: Upload log artifacts uses: actions/upload-artifact/merge@v4 with: From bf78003e6e063120794b85adf4458fb10f525093 Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sat, 18 May 2024 19:49:32 -0400 Subject: [PATCH 07/11] add required arg --- .github/workflows/build-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 70419d258c..2d608cc56b 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -36,6 +36,7 @@ jobs: - name: Upload log artifacts uses: actions/upload-artifact/merge@v4 with: + path: log-* name: build-all retention-days: 1 delete-merged: true From 075a4fe6a7a53da6b33ef28e235a74097f798ace Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sat, 18 May 2024 20:50:24 -0400 Subject: [PATCH 08/11] d --- .github/workflows/build-test.yml | 19 +------------------ .github/workflows/compiler-test.yml | 2 +- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 2d608cc56b..786c07962b 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -32,14 +32,7 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore /m > log-${{ matrix.os }}.txt - - name: Upload log artifacts - uses: actions/upload-artifact/merge@v4 - with: - path: log-* - name: build-all - retention-days: 1 - delete-merged: true + run: dotnet build --property WarningLevel=${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} --configuration Release --no-restore /m # Warnings only for windows build (linux preferred though) - name: Content.Tests shell: pwsh run: | @@ -69,16 +62,6 @@ jobs: path: output/*.tar.gz retention-days: 1 - #clean: - # needs: build - # runs-on: ubuntu-latest - # - name: Clean logs - # if: github.event_name == 'push' - # run: | - # python ./Tools/clean_logs.py output/DMCompiler_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} - # python ./Tools/clean_logs.py output/OpenDreamServer_${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} - - release: needs: build runs-on: ubuntu-latest diff --git a/.github/workflows/compiler-test.yml b/.github/workflows/compiler-test.yml index ddaa73b4f3..9f8d7b28fa 100644 --- a/.github/workflows/compiler-test.yml +++ b/.github/workflows/compiler-test.yml @@ -31,7 +31,7 @@ jobs: - name: Install dependencies run: dotnet restore main/DMCompiler/DMCompiler.csproj - name: Build - run: dotnet build main/DMCompiler/DMCompiler.csproj --configuration Release --no-restore /m + run: dotnet build main/DMCompiler/DMCompiler.csproj --property WarningLevel=0 --configuration Release --no-restore /m - name: Compile TestGame run: main\bin\DMCompiler\DMCompiler.exe main\TestGame\environment.dme - name: Checkout /tg/station Master From b1989418a416eaab6c2fae4395a98d3bd88af24d Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sat, 18 May 2024 20:56:41 -0400 Subject: [PATCH 09/11] man this is confusing stuff --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 786c07962b..b763603c55 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --property WarningLevel=${{ matrix.os == 'windows-latest' && 'win-x64' || 'linux-x64' }} --configuration Release --no-restore /m # Warnings only for windows build (linux preferred though) + run: dotnet build --property WarningLevel=${{ matrix.os == 'ubuntu-latest' && '1' || '0' }} --configuration Release --no-restore /m # Warnings only for windows build (linux preferred though) - name: Content.Tests shell: pwsh run: | From 965dde11d15aae3ed9f494ba872ffe6d4bf1a414 Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Sat, 18 May 2024 21:02:55 -0400 Subject: [PATCH 10/11] and cleanup --- .github/workflows/build-test.yml | 2 +- Tools/clean_logs.py | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 Tools/clean_logs.py diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index b763603c55..bc6966ceba 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --property WarningLevel=${{ matrix.os == 'ubuntu-latest' && '1' || '0' }} --configuration Release --no-restore /m # Warnings only for windows build (linux preferred though) + run: dotnet build --property WarningLevel=${{ matrix.os == 'ubuntu-latest' && '1' || '0' }} --configuration Release --no-restore /m - name: Content.Tests shell: pwsh run: | diff --git a/Tools/clean_logs.py b/Tools/clean_logs.py deleted file mode 100644 index e7e8d1c265..0000000000 --- a/Tools/clean_logs.py +++ /dev/null @@ -1,21 +0,0 @@ -import sys -import re - -if __name__ == "__main__": - log_files = sys.argv[1:] - seen = set() - lines = [] - - warning_pattern = re.compile(r'##\[warning\].*') # catch warnings might want to catch errors? - - for log_file in log_files: - with open(log_file, 'r') as log_in: - lines = log_in.readlines() - with open(log_file, 'w') as log_out: - for line in lines: - if warning_pattern.search(line): - if line not in seen: - seen.add(line) - log_out.write(line) - continue - log_out.write(line) From 449eb82f204029a84ca369f98e5b59e188a7abe1 Mon Sep 17 00:00:00 2001 From: Redmoogle Date: Wed, 22 May 2024 20:52:54 -0400 Subject: [PATCH 11/11] Update .github/workflows/build-test.yml Co-authored-by: wixoa --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index bc6966ceba..f8e105ebb0 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --property WarningLevel=${{ matrix.os == 'ubuntu-latest' && '1' || '0' }} --configuration Release --no-restore /m + run: dotnet build --property WarningLevel=${{ matrix.os == 'ubuntu-latest' && '4' || '0' }} --configuration Release --no-restore /m - name: Content.Tests shell: pwsh run: |