fix

Author: anaelorlinski

.github/workflows/NanoPi-Build.yml

@@ -36,15 +36,15 @@ jobs:
 
     # Map a step output to a job output
     outputs:
-      build_date: ${{ steps.gen_build_date.outputs.build_date }}
+      build_string: ${{ steps.gen_build_string.outputs.build_string }}
       release_tag: ${{ steps.gen_release_tag.outputs.release_tag }}
     steps:
-    - id: gen_build_date
-      run: echo "::set-output name=build_date::$(date +%Y.%m.%d)"
+    - id: gen_build_string
+      run: echo "::set-output name=build_string::$(date +%Y.%m.%d)"
     - id: gen_release_tag
       run: echo "::set-output name=release_tag::$(date +%Y%m%d)"
 
-  toolchain:
+  build:
     needs: init
     strategy:
       matrix:
@@ -66,7 +66,7 @@ jobs:
     - name: Set GITHUB_ENV
       run: |
         echo "TZ=Europe/Paris" >>$GITHUB_ENV
-        echo "BUILD_DATE=${{ needs.init.outputs.build_date }}" >> $GITHUB_ENV
+        echo "BUILD_STRING=${{ needs.init.outputs.build_string }}" >> $GITHUB_ENV
         echo "RELTAG=${{ needs.init.outputs.release_tag }}" >> $GITHUB_ENV
         echo "OPENWRT_BRANCH=${{ github.event.inputs.openwrt_branch }}" >> $GITHUB_ENV
         echo "NANOPI_MODEL=${{ matrix.nanopi_model }}" >> $GITHUB_ENV
@@ -182,7 +182,7 @@ jobs:
 #        #echo "UPLOAD_FIRMWARE=true" >> $GITHUB_ENV
 #        #echo "UPLOAD_RELEASE=true" >> $GITHUB_ENV
 #        echo "TZ=Europe/Paris" >> $GITHUB_ENV
-#        echo "BUILD_DATE=${{ needs.init.outputs.build_date }}" >> $GITHUB_ENV
+#        echo "BUILD_STRING=${{ needs.init.outputs.build_string }}" >> $GITHUB_ENV
 #        echo "RELTAG=${{ needs.init.outputs.release_tag }}" >> $GITHUB_ENV
 #        echo "OPENWRT_BRANCH=${{ github.event.inputs.openwrt_branch }}" >> $GITHUB_ENV
 #        echo "NANOPI_MODEL=${{ github.event.inputs.nanopi_model }}" >> $GITHUB_ENV
@@ -252,7 +252,7 @@ jobs:
       uses: ncipollo/release-action@v1.9.0
       if: ${{ !cancelled() }}
       with:
-        name: OpenWrt ${{ env.OPENWRT_BRANCH }} ${{ env.BUILD_DATE }} 
+        name: OpenWrt ${{ env.OPENWRT_BRANCH }} ${{ env.BUILD_STRING }} 
         allowUpdates: true
         tag: OpenWrtAO-${{ env.OPENWRT_BRANCH }}-${{ env.RELTAG }}
         commit: main

openwrt-21.02/steps/04-prepare_package.sh

@@ -32,13 +32,13 @@ cp -R ../stangri_repo/vpn-policy-routing feeds/packages/net/
 
 # Time stamp with $Build_Date=$(date +%Y.%m.%d)
 MANUAL_DATE="$(date +%Y.%m.%d) (manual build)"
-BUILD_DATE=${BUILD_DATE:-$MANUAL_DATE}
+BUILD_STRING=${BUILD_STRING:-$MANUAL_DATE}
 echo "Write build date in openwrt : $BUILD_DATE"
-echo -e '\nAO Build@'${BUILD_DATE}'\n'  >> package/base-files/files/etc/banner
+echo -e '\nAO Build@'${BUILD_STRING}'\n'  >> package/base-files/files/etc/banner
 #sed -i '/DISTRIB_REVISION/d' package/base-files/files/etc/openwrt_release
-#echo "DISTRIB_REVISION='${BUILD_DATE}'" >> package/base-files/files/etc/openwrt_release
+#echo "DISTRIB_REVISION='${BUILD_STRING}'" >> package/base-files/files/etc/openwrt_release
 sed -i '/DISTRIB_DESCRIPTION/d' package/base-files/files/etc/openwrt_release
-echo "DISTRIB_DESCRIPTION='AO Build@${BUILD_DATE}'" >> package/base-files/files/etc/openwrt_release
+echo "DISTRIB_DESCRIPTION='AO Build@${BUILD_STRING}'" >> package/base-files/files/etc/openwrt_release
 sed -i '/luciversion/d' feeds/luci/modules/luci-base/luasrc/version.lua
 
 rm -rf .config