From 6fff294f7e42f3faf8cdbd6831ece729c88992ef Mon Sep 17 00:00:00 2001 From: Andrew McCall <83285103+Andrew-McCall@users.noreply.github.com> Date: Thu, 9 Nov 2023 10:46:19 +0000 Subject: [PATCH 01/18] Create anotherone --- anotherone | 1 + 1 file changed, 1 insertion(+) create mode 100644 anotherone diff --git a/anotherone b/anotherone new file mode 100644 index 0000000..7021892 --- /dev/null +++ b/anotherone @@ -0,0 +1 @@ +dj kalid From 4c035af22680e499746c3d721ccb5014653819b1 Mon Sep 17 00:00:00 2001 From: Andrew McCall <83285103+Andrew-McCall@users.noreply.github.com> Date: Thu, 9 Nov 2023 10:38:14 +0000 Subject: [PATCH 02/18] Create NewFeature --- NewFeature | 1 + 1 file changed, 1 insertion(+) create mode 100644 NewFeature diff --git a/NewFeature b/NewFeature new file mode 100644 index 0000000..00e85ec --- /dev/null +++ b/NewFeature @@ -0,0 +1 @@ +Has cool things From b7188174800f6a898aba73878fa87e0cf94050f5 Mon Sep 17 00:00:00 2001 From: Papryk Date: Thu, 9 Nov 2023 12:03:41 +0000 Subject: [PATCH 03/18] PF: Fixed Andrews mess --- NewFeature | 1 + 1 file changed, 1 insertion(+) diff --git a/NewFeature b/NewFeature index 00e85ec..8b5eee3 100644 --- a/NewFeature +++ b/NewFeature @@ -1 +1,2 @@ Has cool things + From a2625d14a62980d63401fc189547db3407a36739 Mon Sep 17 00:00:00 2001 From: Andrew McCall <83285103+Andrew-McCall@users.noreply.github.com> Date: Thu, 9 Nov 2023 10:46:19 +0000 Subject: [PATCH 04/18] Create anotherone --- anotherone | 1 + 1 file changed, 1 insertion(+) create mode 100644 anotherone diff --git a/anotherone b/anotherone new file mode 100644 index 0000000..7021892 --- /dev/null +++ b/anotherone @@ -0,0 +1 @@ +dj kalid From d3e2698d6082420374763f781ff734354ee0291e Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 10:56:39 +0000 Subject: [PATCH 05/18] PF: Update NewFeature --- NewFeature | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NewFeature b/NewFeature index 8b5eee3..b2d1e45 100644 --- a/NewFeature +++ b/NewFeature @@ -1,2 +1,5 @@ Has cool things +- Has cool things +- Cool thiny +xyzzzz From a13b425da5347794c47193091eb319f1be468846 Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 11:34:47 +0000 Subject: [PATCH 06/18] PF: Create README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..6834138 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# LBG Fork +# This is a developed repo of Andrew McCall +# In this fork we will be working on XYZ +# The goal is for XYZ to act ... From 199061d73e894090d1f4d34f73483bc75a08a5f3 Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 11:36:52 +0000 Subject: [PATCH 07/18] PF: Create Beta.txt --- Beta.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Beta.txt diff --git a/Beta.txt b/Beta.txt new file mode 100644 index 0000000..07f7c6d --- /dev/null +++ b/Beta.txt @@ -0,0 +1,2 @@ +This beta is responsible for XYZ +This will allow the .txt to do XYZ From 8ed5be801153e87463934f51621312139bd4668a Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 11:38:01 +0000 Subject: [PATCH 08/18] PF: Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6834138..7ef50d5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # LBG Fork # This is a developed repo of Andrew McCall # In this fork we will be working on XYZ -# The goal is for XYZ to act ... +# The goal is for XYZ to act . From c16a0b2a98ce64929ab57f302f190e009118c04e Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 11:40:42 +0000 Subject: [PATCH 09/18] PF: Further Updates Alpha_Tests --- Alpha_Tests | 1 + 1 file changed, 1 insertion(+) diff --git a/Alpha_Tests b/Alpha_Tests index b924baa..ea08bdd 100644 --- a/Alpha_Tests +++ b/Alpha_Tests @@ -3,3 +3,4 @@ During the Alpha test we will test: - x - y - z +Once the tests are conducted we will do XYZ From 1eaae0698b74033d855dcf503ef2bb4dfb4cb869 Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 11:39:08 +0000 Subject: [PATCH 10/18] PF: Create Alpha_Tests --- Alpha_Tests | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Alpha_Tests diff --git a/Alpha_Tests b/Alpha_Tests new file mode 100644 index 0000000..b924baa --- /dev/null +++ b/Alpha_Tests @@ -0,0 +1,5 @@ +Alpha tests will be conducted on xx.xx.xxxx +During the Alpha test we will test: +- x +- y +- z From 909dde16658e66c10b72797cf642dede2f3fa61d Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 13:56:48 +0000 Subject: [PATCH 11/18] PF: Create FetchingTest --- FetchingTest | 1 + 1 file changed, 1 insertion(+) create mode 100644 FetchingTest diff --git a/FetchingTest b/FetchingTest new file mode 100644 index 0000000..602a442 --- /dev/null +++ b/FetchingTest @@ -0,0 +1 @@ +Checks From 8c93267a78bdb288f9e9af50c25968da36e68b1d Mon Sep 17 00:00:00 2001 From: Papryk Date: Thu, 9 Nov 2023 15:19:04 +0000 Subject: [PATCH 12/18] PF Created reset.txt --- reset.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 reset.txt diff --git a/reset.txt b/reset.txt new file mode 100644 index 0000000..e69de29 From e0876c67238c3a2833501884adcd65a085533a84 Mon Sep 17 00:00:00 2001 From: Papryk Date: Thu, 9 Nov 2023 15:20:39 +0000 Subject: [PATCH 13/18] PF Created resetv2.txt --- resetv2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resetv2.txt diff --git a/resetv2.txt b/resetv2.txt new file mode 100644 index 0000000..e69de29 From 351094d0c97ffa10e4268b36444a860a1acc84e1 Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 15:24:20 +0000 Subject: [PATCH 14/18] PF Update resetv2.txt --- resetv2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/resetv2.txt b/resetv2.txt index e69de29..b219107 100644 --- a/resetv2.txt +++ b/resetv2.txt @@ -0,0 +1 @@ +making conflicts!!! From fbae2a64c838953c485c4147f54c3215a25ac4d6 Mon Sep 17 00:00:00 2001 From: Papryk Date: Thu, 9 Nov 2023 15:25:10 +0000 Subject: [PATCH 15/18] Created resetv2.txt --- resetv2.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 resetv2.txt diff --git a/resetv2.txt b/resetv2.txt new file mode 100644 index 0000000..a01ba6b --- /dev/null +++ b/resetv2.txt @@ -0,0 +1 @@ +conflict in reset From 7b9f020f795ab994c4e1c048928efd60f81e20c5 Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 16:02:49 +0000 Subject: [PATCH 16/18] PF: Create main.yml --- .github/workflows/main.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..a21f861 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,34 @@ +# This is a basic workflow to help you get started with Actions + +name: main + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the "main" branch + pull_request: + branches: [ "main" ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # 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 + - uses: actions/checkout@v3 + + # Runs a single command using the runners shell + - name: Run a one-line script + run: echo I created a simple workflow!!! + + # Runs a single command using the runners shell + - name: Run a one-line script + run: nano README.md + + From 9ce6db939a5513e0ec1dedb8b3a770322f9f094e Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 16:07:59 +0000 Subject: [PATCH 17/18] PF: 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 a21f861..71c698a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,6 @@ jobs: # Runs a single command using the runners shell - name: Run a one-line script - run: nano README.md + run: ls From 7de43985f7722040b46c114a04bd0873f3b33eca Mon Sep 17 00:00:00 2001 From: Patryk <150165580+Paprryk@users.noreply.github.com> Date: Thu, 9 Nov 2023 16:29:35 +0000 Subject: [PATCH 18/18] PF: 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 71c698a..48b7452 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,6 @@ jobs: # Runs a single command using the runners shell - name: Run a one-line script - run: ls + run: cat README.md