From c10c25911f572f36af86994a4df57a4020da52aa Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 13:27:25 +1300 Subject: [PATCH 01/17] white space commit --- .github/workflows/ubuntodotnet.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index 2846780..df144a1 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -60,7 +60,11 @@ jobs: run: dotnet build --no-restore - name: ls - run: ls -a + run: ls -a + + + + - name: run run: dotnet run --project ConsoleAppSVS-test/ConsoleAppSVS-test.csproj From 935747f239302b7bca9fec5b930024a078a386a7 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 13:33:49 +1300 Subject: [PATCH 02/17] Python code - Blue Title now --- modelCsharp/TestModel/testGraph/testGraph/testGraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modelCsharp/TestModel/testGraph/testGraph/testGraph.py b/modelCsharp/TestModel/testGraph/testGraph/testGraph.py index 47e8001..31be920 100644 --- a/modelCsharp/TestModel/testGraph/testGraph/testGraph.py +++ b/modelCsharp/TestModel/testGraph/testGraph/testGraph.py @@ -112,7 +112,7 @@ def make_observed(observed): makeplot(Data,color) make_observed(observed_data[datefilter]) Graph.tight_layout(pad=1.5) - Graph.suptitle('DRAFT VERSION',fontsize = 32, color = "r") + Graph.suptitle('DRAFT VERSION',fontsize = 32, color = "b") pos+=1 From c469e62d63fb98141cb24932e9a97957b941142f Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 14:34:25 +1300 Subject: [PATCH 03/17] no spaces --- .github/workflows/ubuntodotnet.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index df144a1..78aeb00 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -58,14 +58,7 @@ jobs: - name: Build run: dotnet build --no-restore - - - name: ls - run: ls -a - - - - - + - name: run run: dotnet run --project ConsoleAppSVS-test/ConsoleAppSVS-test.csproj @@ -97,3 +90,6 @@ jobs: - name: Override page_url id: change-page-url run: echo "new_page_url=${{ steps.deployment.outputs.page_url }}index.html" >> $GITHUB_OUTPUT + + - name: ls + run: ls -a \ No newline at end of file From c0c36b3d92a7c41dbe2ef9814b1474f2a44f4021 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 14:54:07 +1300 Subject: [PATCH 04/17] branches: - main --- .github/workflows/ubuntodotnet.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index 78aeb00..f6ba2f0 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -3,7 +3,17 @@ name: .NET -on: pull_request_target +#on: pull_request_target + +on: + push: + branches: + - main + pull_request_target: + branches: + - main + + jobs: build: From 85f7653d71d0d8fb195012a9f1deaba4a9b16d95 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 14:57:50 +1300 Subject: [PATCH 05/17] spaces in python --- modelCsharp/TestModel/testGraph/testGraph/testGraph.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modelCsharp/TestModel/testGraph/testGraph/testGraph.py b/modelCsharp/TestModel/testGraph/testGraph/testGraph.py index 31be920..8ce946f 100644 --- a/modelCsharp/TestModel/testGraph/testGraph/testGraph.py +++ b/modelCsharp/TestModel/testGraph/testGraph/testGraph.py @@ -134,6 +134,8 @@ def make_observed(observed): plt.show() + + #shutil.rmtree(path+"\\OutputFiles") #shutil.rmtree(path+"\\NitrogenApplied") From 20a99a45b5818c09722b0a2fc9c25867d508e255 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 15:27:12 +1300 Subject: [PATCH 06/17] TestRuns --- .github/workflows/ubuntodotnet.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index f6ba2f0..f1f6140 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -7,13 +7,10 @@ name: .NET on: push: - branches: - - main + branches: [ "TestRuns" ] pull_request_target: - branches: - - main - - + branches: [ "TestRuns" ] + jobs: build: From ef3d322cfbb470d84a22ce4408e8c7be3b1f30e0 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 15:41:04 +1300 Subject: [PATCH 07/17] on: pull_request_target: branches: [ "TestRuns" ] --- .github/workflows/ubuntodotnet.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index f1f6140..2834bb7 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -6,8 +6,6 @@ name: .NET #on: pull_request_target on: - push: - branches: [ "TestRuns" ] pull_request_target: branches: [ "TestRuns" ] From e8070fe0b787cb24dc526e76c6c9b41c47d8a40d Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 15:44:18 +1300 Subject: [PATCH 08/17] GIT commit and push all changed files --- .github/workflows/ubuntodotnet.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index 2834bb7..48343d6 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -97,4 +97,14 @@ jobs: run: echo "new_page_url=${{ steps.deployment.outputs.page_url }}index.html" >> $GITHUB_OUTPUT - name: ls - run: ls -a \ No newline at end of file + run: ls -a + +- name: GIT commit and push all changed files + env: + CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + CI_COMMIT_AUTHOR: Continuous Integration + run: | + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + git config --global user.email "username@users.noreply.github.com" + git commit -a -m "${{ env.CI_COMMIT_MESSAGE }}" + git push \ No newline at end of file From 4d4142d10da83adb492a341b66e64fea62d9ad08 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 15:46:03 +1300 Subject: [PATCH 09/17] different line --- .github/workflows/ubuntodotnet.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index 48343d6..9b741fc 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -1,6 +1,12 @@ # This workflow will build a .NET project # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net + + + + + + name: .NET #on: pull_request_target @@ -98,13 +104,4 @@ jobs: - name: ls run: ls -a - -- name: GIT commit and push all changed files - env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts - CI_COMMIT_AUTHOR: Continuous Integration - run: | - git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - git config --global user.email "username@users.noreply.github.com" - git commit -a -m "${{ env.CI_COMMIT_MESSAGE }}" - git push \ No newline at end of file +GIT commit and push all changed files \ No newline at end of file From 67cb046555f7f2f9671ba8684e4d0f827daaf05c Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 15:49:32 +1300 Subject: [PATCH 10/17] cimmit all to master --- .github/workflows/ubuntodotnet.yml | 13 +++++++++++-- .../TestModel/testGraph/testGraph/testGraph.py | 1 - 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index 9b741fc..0e6783a 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -19,6 +19,16 @@ on: jobs: build: + env: + CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + CI_COMMIT_AUTHOR: Continuous Integration + run: | + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + git config --global user.email "username@users.noreply.github.com" + git commit -a -m "${{ env.CI_COMMIT_MESSAGE }}" + git push + + runs-on: ubuntu-latest permissions: @@ -103,5 +113,4 @@ jobs: run: echo "new_page_url=${{ steps.deployment.outputs.page_url }}index.html" >> $GITHUB_OUTPUT - name: ls - run: ls -a -GIT commit and push all changed files \ No newline at end of file + run: ls -a \ No newline at end of file diff --git a/modelCsharp/TestModel/testGraph/testGraph/testGraph.py b/modelCsharp/TestModel/testGraph/testGraph/testGraph.py index 8ce946f..83b7a81 100644 --- a/modelCsharp/TestModel/testGraph/testGraph/testGraph.py +++ b/modelCsharp/TestModel/testGraph/testGraph/testGraph.py @@ -135,7 +135,6 @@ def make_observed(observed): plt.show() - #shutil.rmtree(path+"\\OutputFiles") #shutil.rmtree(path+"\\NitrogenApplied") From 34e13c8c4697284c551cb921ef654f5b62fde00e Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 15:52:51 +1300 Subject: [PATCH 11/17] new trry with commit all --- .github/workflows/ubuntodotnet.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index 0e6783a..672f825 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -1,12 +1,6 @@ # This workflow will build a .NET project # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net - - - - - - name: .NET #on: pull_request_target @@ -19,16 +13,6 @@ on: jobs: build: - env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts - CI_COMMIT_AUTHOR: Continuous Integration - run: | - git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - git config --global user.email "username@users.noreply.github.com" - git commit -a -m "${{ env.CI_COMMIT_MESSAGE }}" - git push - - runs-on: ubuntu-latest permissions: @@ -59,6 +43,13 @@ jobs: with: python-version: 3.11.6 + - name: Install Python pandas + run: | + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + git config --global user.email "username@users.noreply.github.com" + git commit -a -m "${{ env.CI_COMMIT_MESSAGE }}" + git push + #installing packages - name: Install Python pandas run: python -m pip install --upgrade pip pandas From d43a7fd16e64ed5e39e821b5851c756623b75c52 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 15:56:13 +1300 Subject: [PATCH 12/17] TestRuns --- .github/workflows/ubuntodotnet.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index 672f825..5c161ee 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -6,10 +6,12 @@ name: .NET #on: pull_request_target on: + push: + branches: + - main pull_request_target: branches: [ "TestRuns" ] - jobs: build: @@ -43,13 +45,6 @@ jobs: with: python-version: 3.11.6 - - name: Install Python pandas - run: | - git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - git config --global user.email "username@users.noreply.github.com" - git commit -a -m "${{ env.CI_COMMIT_MESSAGE }}" - git push - #installing packages - name: Install Python pandas run: python -m pip install --upgrade pip pandas From 6026d8ba3e2a6f428c751d1fbd7d408aeb94e03b Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 16:01:09 +1300 Subject: [PATCH 13/17] GIT commit and push docs --- .github/workflows/ubuntodotnet.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index 5c161ee..be97442 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -6,11 +6,20 @@ name: .NET #on: pull_request_target on: - push: - branches: - - main pull_request_target: branches: [ "TestRuns" ] + + - name: GIT commit and push docs + env: + CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + CI_COMMIT_AUTHOR: Continuous Integration + run: | + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + git config --global user.email "username@users.noreply.github.com" + git add docs + git commit -m "${{ env.CI_COMMIT_MESSAGE }}" + git push + jobs: build: From 41b7c66d360bde98f41d3a999906193bf7c4888a Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 16:03:32 +1300 Subject: [PATCH 14/17] - name: GIT commit and push docs --- .github/workflows/ubuntodotnet.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index be97442..3364aae 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -8,18 +8,6 @@ name: .NET on: pull_request_target: branches: [ "TestRuns" ] - - - name: GIT commit and push docs - env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts - CI_COMMIT_AUTHOR: Continuous Integration - run: | - git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - git config --global user.email "username@users.noreply.github.com" - git add docs - git commit -m "${{ env.CI_COMMIT_MESSAGE }}" - git push - jobs: build: @@ -48,7 +36,20 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 6.0.x - + + - name: GIT commit and push docs + env: + CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + CI_COMMIT_AUTHOR: Continuous Integration + run: | + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + git config --global user.email "username@users.noreply.github.com" + git add docs + git commit -m "${{ env.CI_COMMIT_MESSAGE }}" + git push + + + - name: Install Python 3 uses: actions/setup-python@v1 with: From ed9045e1c7aa11d3d18de31322cb0d6143ebbab6 Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 16:05:44 +1300 Subject: [PATCH 15/17] GIT commit and push docs --- .github/workflows/ubuntodotnet.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index 3364aae..87f78a1 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -10,6 +10,18 @@ on: branches: [ "TestRuns" ] jobs: + + - name: GIT commit and push docs + env: + CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + CI_COMMIT_AUTHOR: Continuous Integration + run: | + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + git config --global user.email "username@users.noreply.github.com" + git add docs + git commit -m "${{ env.CI_COMMIT_MESSAGE }}" + git push + build: runs-on: ubuntu-latest @@ -37,16 +49,7 @@ jobs: with: dotnet-version: 6.0.x - - name: GIT commit and push docs - env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts - CI_COMMIT_AUTHOR: Continuous Integration - run: | - git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - git config --global user.email "username@users.noreply.github.com" - git add docs - git commit -m "${{ env.CI_COMMIT_MESSAGE }}" - git push + From 7fbbbcb95b9484b54696cfe0acbbccb6086dc2eb Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 16:11:26 +1300 Subject: [PATCH 16/17] again --- .github/workflows/ubuntodotnet.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index 87f78a1..e3603cf 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -8,8 +8,6 @@ name: .NET on: pull_request_target: branches: [ "TestRuns" ] - -jobs: - name: GIT commit and push docs env: @@ -20,7 +18,10 @@ jobs: git config --global user.email "username@users.noreply.github.com" git add docs git commit -m "${{ env.CI_COMMIT_MESSAGE }}" - git push + git push TestRuns + + +jobs: build: @@ -49,10 +50,6 @@ jobs: with: dotnet-version: 6.0.x - - - - - name: Install Python 3 uses: actions/setup-python@v1 with: From e44607a9e8e77b676853f6bf48d7f3baf76835ce Mon Sep 17 00:00:00 2001 From: Sasha Date: Thu, 16 Nov 2023 16:14:21 +1300 Subject: [PATCH 17/17] source - actions --- .github/workflows/ubuntodotnet.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ubuntodotnet.yml b/.github/workflows/ubuntodotnet.yml index e3603cf..1a4a274 100644 --- a/.github/workflows/ubuntodotnet.yml +++ b/.github/workflows/ubuntodotnet.yml @@ -8,18 +8,6 @@ name: .NET on: pull_request_target: branches: [ "TestRuns" ] - - - name: GIT commit and push docs - env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts - CI_COMMIT_AUTHOR: Continuous Integration - run: | - git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - git config --global user.email "username@users.noreply.github.com" - git add docs - git commit -m "${{ env.CI_COMMIT_MESSAGE }}" - git push TestRuns - jobs: @@ -53,7 +41,21 @@ jobs: - name: Install Python 3 uses: actions/setup-python@v1 with: - python-version: 3.11.6 + python-version: 3.11.6 + + + + - name: GIT commit and push docs + env: + CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + CI_COMMIT_AUTHOR: Continuous Integration + run: | + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + git config --global user.email "username@users.noreply.github.com" + git add docs + git commit -m "${{ env.CI_COMMIT_MESSAGE }}" + git push TestRuns + #installing packages - name: Install Python pandas