SNAPSHOT support

fantastic-packages · Dec 4, 2024 · 693aa27 · 693aa27
1 parent cde84c0
commit 693aa27
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/.github/workflows/buildimage.yml b/.github/workflows/buildimage.yml
@@ -6,7 +6,7 @@ on:
       version:
         description: 'Release version'
         required: true
-        default: '23.05.5|24.10.0-rc1'
+        default: '23.05.5|24.10.0-rc1|SNAPSHOT'
         type: string
       board:
         description: 'Device board'
@@ -68,12 +68,14 @@ jobs:
       - name: Determine branch name and Generate op_target_url_prefix
         shell: bash
         run: |
+          SNAPSHOTS=$(echo "$OP_VERSION" | grep -q SNAPSHOT && { [ "$OP_VERSION" = "SNAPSHOT" ] && echo y || echo i; } || echo )
+          echo "SNAPSHOTS=$SNAPSHOTS" >> $GITHUB_ENV
           SNAPSHOTS_BRANCH="$(echo "$OP_VERSION" | sed -En 's|^(.+)-SNAPSHOT$|\1|p')"
           echo "SNAPSHOTS_BRANCH=$SNAPSHOTS_BRANCH" >> $GITHUB_ENV
           BRANCH="$([ -n "$SNAPSHOTS_BRANCH" ] && echo "$SNAPSHOTS_BRANCH" || echo "${OP_VERSION%.*}")"
           echo "Building for $BRANCH"
           echo "BRANCH=$BRANCH" >> $GITHUB_ENV
-          op_target_url_prefix="$MIRROR_URL/$([ -n "$SNAPSHOTS_BRANCH" ] && echo 'snapshots' || echo "releases/$OP_VERSION")/targets/${{ inputs.board }}/${{ inputs.subtarget}}"
+          op_target_url_prefix="$MIRROR_URL/$([ -n "$SNAPSHOTS" ] && echo snapshots || echo "releases/$OP_VERSION")/targets/${{ inputs.board }}/${{ inputs.subtarget}}"
           echo "op_target_url_prefix=$op_target_url_prefix" >> $GITHUB_ENV
 
       - name: Maximize build space
@@ -116,12 +118,13 @@ jobs:
           fi
           }
           preinstalled=''
-          if [ -n "$SNAPSHOTS_BRANCH" ]; then
+          if [ -n "$SNAPSHOTS" ]; then
+            sel_config preinstalled "$BRANCH" preinstalled ||
             sel_config preinstalled "snapshots" preinstalled ||
             sel_config preinstalled "default" preinstalled || sleep 0
           else
             sel_config preinstalled "$OP_VERSION" preinstalled ||
-            sel_config preinstalled "${OP_VERSION%.*}" preinstalled ||
+            sel_config preinstalled "$BRANCH" preinstalled ||
             sel_config preinstalled "default" preinstalled || sleep 0
           fi
           echo "preinstalled='$preinstalled'"
@@ -164,6 +167,11 @@ jobs:
           sed -i "/src\/gz rebuild_core /{ \
             s|${op_target_url_prefix}|file://$GITHUB_WORKSPACE/targets/${{ inputs.board }}/${{ inputs.subtarget}}| \
           }" repositories.conf
+          # SNAPSHOT
+          if [ -n "$SNAPSHOTS" ]; then
+            sed -i "/\/targets\/${{ inputs.board }}\/${{ inputs.subtarget}}\/kmods\//d" repositories.conf
+            sed -i "s|releases/$OP_VERSION|snapshots|" repositories.conf
+          fi
           # fantastic feeds
           n=$[ $(sed -n '/This is the local package repository/=' repositories.conf) -1 ]
           sed -i "${n}i\

diff --git a/.github/workflows/rebuild.yml b/.github/workflows/rebuild.yml
@@ -6,7 +6,7 @@ on:
       version:
         description: 'Release version'
         required: true
-        default: '23.05.5|24.10.0-rc1'
+        default: '23.05.5|24.10.0-rc1|SNAPSHOT'
         type: string
       board:
         description: 'Device board'
@@ -58,13 +58,22 @@ jobs:
           echo rcode: $rcode
           [ "$rcode" = "404" ] || { echo "DEPLOYED=y" >> $GITHUB_ENV; }
 
-      - name: Check raw config.buildinfo
+      - name: Determine branch name and Generate op_target_url_prefix
         shell: bash
         run: |
+          SNAPSHOTS=$(echo "$OP_VERSION" | grep -q SNAPSHOT && { [ "$OP_VERSION" = "SNAPSHOT" ] && echo y || echo i; } || echo )
+          echo "SNAPSHOTS=$SNAPSHOTS" >> $GITHUB_ENV
           SNAPSHOTS_BRANCH="$(echo "$OP_VERSION" | sed -En 's|^(.+)-SNAPSHOT$|\1|p')"
           echo "SNAPSHOTS_BRANCH=$SNAPSHOTS_BRANCH" >> $GITHUB_ENV
-          op_target_url_prefix="$MIRROR_URL/$([ -n "$SNAPSHOTS_BRANCH" ] && echo 'snapshots' || echo "releases/$OP_VERSION")/targets/${{ inputs.board }}/${{ inputs.subtarget}}"
+          BRANCH="$([ -n "$SNAPSHOTS_BRANCH" ] && echo "$SNAPSHOTS_BRANCH" || echo "${OP_VERSION%.*}")"
+          echo "Building for $BRANCH"
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+          op_target_url_prefix="$MIRROR_URL/$([ -n "$SNAPSHOTS" ] && echo snapshots || echo "releases/$OP_VERSION")/targets/${{ inputs.board }}/${{ inputs.subtarget}}"
           echo "op_target_url_prefix=$op_target_url_prefix" >> $GITHUB_ENV
+
+      - name: Check raw config.buildinfo
+        shell: bash
+        run: |
           rcode=$(curl -sL -w '%{http_code}' -o /dev/null "${op_target_url_prefix}/config.buildinfo")
           echo rcode: $rcode
           [ "$rcode" != "404" ] || { >&2 echo No raw config.buildinfo exist.; exit 1; }
@@ -111,26 +120,28 @@ jobs:
           }
           #
           config=''
-          if [ -n "$SNAPSHOTS_BRANCH" ]; then
+          if [ -n "$SNAPSHOTS" ]; then
+            sel_config config "$BRANCH" buildinfo.sh ||
             sel_config config "snapshots" buildinfo.sh ||
             sel_config config "default" buildinfo.sh ||
             { >&2 echo No buildinfo.sh can be build.; exit 1; }
           else
             sel_config config "$OP_VERSION" buildinfo.sh ||
-            sel_config config "${OP_VERSION%.*}" buildinfo.sh ||
+            sel_config config "$BRANCH" buildinfo.sh ||
             sel_config config "default" buildinfo.sh ||
             { >&2 echo No buildinfo.sh can be build.; exit 1; }
           fi
           echo "config='$config'"
           echo "config=$config" >> $GITHUB_ENV
           #
           faillogs=''
-          if [ -n "$SNAPSHOTS_BRANCH" ]; then
+          if [ -n "$SNAPSHOTS" ]; then
+            sel_config faillogs "$BRANCH" faillogs.txt ||
             sel_config faillogs "snapshots" faillogs.txt ||
             sel_config faillogs "default" faillogs.txt || sleep 0
           else
             sel_config faillogs "$OP_VERSION" faillogs.txt ||
-            sel_config faillogs "${OP_VERSION%.*}" faillogs.txt ||
+            sel_config faillogs "$BRANCH" faillogs.txt ||
             sel_config faillogs "default" faillogs.txt || sleep 0
           fi
           echo "faillogs='$faillogs'"
@@ -160,7 +171,8 @@ jobs:
         if: ${{ steps.checkout_to_targetbranch.outcome == 'success' }}
         shell: bash
         run: |
-          git clone --depth 1 --branch $([ -n "$SNAPSHOTS_BRANCH" ] && echo "openwrt-$SNAPSHOTS_BRANCH" || echo "v$OP_VERSION") https://github.com/openwrt/openwrt.git openwrt
+          git clone --depth 1 --branch $([ -z "$SNAPSHOTS" ] && echo "v$OP_VERSION" || { [ "$SNAPSHOTS" = "i" ] && echo "openwrt-$BRANCH" || echo main; }) \
+          https://github.com/openwrt/openwrt.git openwrt
           # .config
           curl -Lo openwrt/.config "${op_target_url_prefix}/config.buildinfo"
           git checkout origin/$CONFBRANCH -- "$config" 2>/dev/null || echo