revert back for development (#566)

This commit is contained in:
dman776 2022-12-14 11:20:08 -06:00 committed by GitHub
parent 63e7919753
commit 7526c8946b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 4 deletions

View File

@ -17,7 +17,7 @@ UMASK=umask 022
# set variables based on private or CircleCI build # set variables based on private or CircleCI build
ifeq ($(CIRCLECI),true) ifeq ($(CIRCLECI),true)
$(info CircleCI build ...) $(info CircleCI build ...)
FW_VERSION=$(PRIVATE_BUILD_VERSION) FW_VERSION=$(PRIVATE_BUILD_VERSION)-$(GIT_COMMIT)
else else
FW_VERSION=$(PRIVATE_BUILD_VERSION)-$(GIT_BRANCH)-$(GIT_COMMIT) FW_VERSION=$(PRIVATE_BUILD_VERSION)-$(GIT_BRANCH)-$(GIT_COMMIT)
endif endif

View File

@ -45,7 +45,6 @@ turned into a release.
Please refer to https://github.com/aredn/aredn/issues Please refer to https://github.com/aredn/aredn/issues
for a list of outstanding defects. for a list of outstanding defects.
This is the 3.22.12.0 release.
### Images built ### Images built

View File

@ -1,7 +1,7 @@
# default parameters for Makefile # default parameters for Makefile
# What version will show in the AREDN firmware 'Node Status" UI page? # What version will show in the AREDN firmware 'Node Status" UI page?
PRIVATE_BUILD_VERSION=3.22.12.0 PRIVATE_BUILD_VERSION=NoCall
# build options: -j# for (# of cores +1) on build machine, V=s for verbose output # build options: -j# for (# of cores +1) on build machine, V=s for verbose output
# https://wiki.openwrt.org/doc/howto/build#make_options (archive) # https://wiki.openwrt.org/doc/howto/build#make_options (archive)

View File

@ -1 +1 @@
src-git arednpackages https://github.com/aredn/aredn_packages;3.22.12.0 src-git arednpackages https://github.com/aredn/aredn_packages;develop