Merge pull request #2115 from AuxXxilium/dev

Dev
AuxXxilium · Jun 24, 2024 · b8e0732 · b8e0732
2 parents 3b2437e + caa6007
commit b8e0732
Show file tree

Hide file tree

Showing 12 changed files with 351 additions and 309 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -134,7 +134,7 @@ jobs:
           getOffline "files/p3/configs"
           echo "Get Buildroot"
           getBuildroot "latest" "br"
-          echo "BR_VERSION=${TAG}" >> $GITHUB_ENV
+          #echo "BR_VERSION=${TAG}" >> $GITHUB_ENV
           echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV
 
           echo "OK"
@@ -234,7 +234,6 @@ jobs:
             Time: ${{ env.BUILD_TIME }}
 
             ### Versions:
-            Buildroot: ${{ env.BR_VERSION }}
             Addons: ${{ env.ADDONSTAG }}
             Configs: ${{ env.CONFIGSTAG }}
             Modules: ${{ env.MODULESTAG }}
@@ -244,4 +243,4 @@ jobs:
           artifacts: |
             arc-*.zip
             update.zip
-            checksum.sha256
+            checksum.sha256
diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml
@@ -47,7 +47,6 @@ jobs:
               MODEL = jsonbody.get('model', '')
               PRODUCTVER = jsonbody.get('version', '')
               ADDONS = jsonbody.get('addons', '')
-              MACSYS = jsonbody.get('macsys', '')
               CUSTOMKERNEL = jsonbody.get('customkernel', '')
               FORMAT = jsonbody.get('format', '')
           except ValueError as e:
@@ -56,7 +55,6 @@ jobs:
           set_output("MODEL", MODEL)
           set_output("PRODUCTVER", PRODUCTVER)
           set_output("ADDONS", ADDONS)
-          set_output("MACSYS", MACSYS)
           set_output("CUSTOMKERNEL", CUSTOMKERNEL)
           set_output("FORMAT", FORMAT)
 
@@ -121,7 +119,6 @@ jobs:
           writeConfigKey "model" "${{ env.MODEL }}" "${PRESET_CONFIG_FILE}"
           writeConfigKey "productver" "${{ env.PRODUCTVER }}" "${PRESET_CONFIG_FILE}"
           writeConfigKey "arc" "{}" "${PRESET_CONFIG_FILE}"
-          writeConfigKey "arc.macsys" "${{ env.MACSYS }}" "${PRESET_CONFIG_FILE}"
           writeConfigKey "arc.custom" "true" "${PRESET_CONFIG_FILE}"
           if [ "${{ env.MODEL }}" = "SA6400" ]; then
             writeConfigKey "arc.kernel" "${{ env.KERNEL }}" "${PRESET_CONFIG_FILE}"