Merge branch 'main' into release

xoriors · Dec 27, 2024 · d720afc · d720afc
2 parents dccdcee + 0b80e81
commit d720afc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build_and_tests2.yaml → .github/workflows/build_and_tests.yaml b/.github/workflows/build_and_tests2.yaml → .github/workflows/build_and_tests.yaml
@@ -1,4 +1,4 @@
-name: build-and-tests2 # the name and filename have 2 as suffix because of some caching issues with GitHub actions
+name: build-and-tests
 on:
   push:
     branches: [ main, release ]
@@ -19,12 +19,12 @@ jobs:
 
   build_and_test:
     name: build and test
-    uses: xoriors/rencfs/.github/workflows/build_and_tests_reusable2.yaml@main
+    uses: xoriors/rencfs/.github/workflows/build_and_tests_reusable.yaml@main
     secrets: inherit
 
   package:
     needs: [ version, build_and_test ]
-    uses: xoriors/rencfs/.github/workflows/package_reusable2.yaml@main
+    uses: xoriors/rencfs/.github/workflows/package_reusable.yaml@main
     with:
       upload_artifacts: false
       version: ${{ needs.version.outputs.version }}

diff --git a/.../workflows/build_and_tests_reusable2.yaml → ...b/workflows/build_and_tests_reusable.yaml b/.../workflows/build_and_tests_reusable2.yaml → ...b/workflows/build_and_tests_reusable.yaml
@@ -1,4 +1,4 @@
-name: '_build-and-tests2' # the name and filename have 2 as suffix because of some caching issues with GitHub actions
+name: '_build-and-tests'
 on:
   workflow_call:
 

diff --git a/.github/workflows/package_reusable2.yaml → .github/workflows/package_reusable.yaml b/.github/workflows/package_reusable2.yaml → .github/workflows/package_reusable.yaml
@@ -1,4 +1,4 @@
-name: '_package2' # the name and filename have 2 as suffix because of some caching issues with GitHub actions
+name: '_package'
 on:
   workflow_call:
     inputs:

diff --git a/.github/workflows/release2.yaml → .github/workflows/release.yaml b/.github/workflows/release2.yaml → .github/workflows/release.yaml
@@ -15,12 +15,12 @@ jobs:
 
   build_and_test:
     name: build and test
-    uses: xoriors/rencfs/.github/workflows/build_and_tests_reusable2.yaml@main
+    uses: xoriors/rencfs/.github/workflows/build_and_tests_reusable.yaml@main
     secrets: inherit
 
   package:
     needs: [ version, build_and_test ]
-    uses: xoriors/rencfs/.github/workflows/package_reusable2.yaml@main
+    uses: xoriors/rencfs/.github/workflows/package_reusable.yaml@main
     with:
       upload_artifacts: true
       version: ${{ needs.version.outputs.version }}

diff --git a/docs/readme/Testing.md b/docs/readme/Testing.md
@@ -13,7 +13,7 @@ The instance config is 2 CPUs and 4 GB RAM. You have 120 CPU hours per month fre
 
 ### First setup
 
-1. Open the [repo](https://github.com/radumarias/rencfs)
+1. Open the [repo](https://github.com/xoriors/rencfs)
 2. Press `Code` button  
   ![image](https://github.com/user-attachments/assets/7c0e8872-fe1f-44b9-a833-2586ade4f618)
 3. Create codespace on main  
@@ -42,7 +42,7 @@ The instance config is 2 CPUs and 4 GB RAM. You have 120 CPU hours per month fre
 
 ### Each resume and after the first setup
 
-1. Open the [repo](https://github.com/radumarias/rencfs)
+1. Open the [repo](https://github.com/xorio/rencfs)
 2. Press `Code` button  
   ![image](https://github.com/user-attachments/assets/7c0e8872-fe1f-44b9-a833-2586ade4f618)
 3. Press ```...``` right to the instance in the list  
@@ -60,7 +60,7 @@ Make sure you have VSCode installed locally, based on your OS.
 
 #### Continue
 
-Do step 11 from above.
+Do step 6 from above.
 
 5. Type this in the VSCode terminal, which will fetch the changes from the repo (if there are conflicts, accept Theirs):
   ```bash
@@ -84,7 +84,7 @@ Repeat steps 7-9 in various ways.
 
 #### Test specific issues
 
-Test specific issues from the [project](https://github.com/users/radumarias/projects/1). You can take the ones from `Ready for QA` column:
+Test specific issues from the [project](https://github.com/users/xoriors/projects/1). You can take the ones from `Ready for QA` column:
 1. Assign the issue to you and move it to `In QA`
 2. Test it
 3. When you finished, move it to `Tested`
@@ -103,7 +103,7 @@ I created some [files](https://drive.google.com/drive/folders/1N-2KhGNo7f23tQ9Si
 
 ## Open a bug
 
-Please use [this](https://github.com/radumarias/rencfs/issues/new?assignees=&labels=&projects=&template=bug_report.md&title=) and follow the steps in there.
+Please use [this](https://github.com/xoriors/rencfs/issues/new?assignees=&labels=&projects=&template=bug_report.md&title=) and follow the steps in there.
 
 ## Creating a test case