Compare commits

...

4 Commits
v0.1.4 ... main

Author SHA1 Message Date
97f41285c3
Fixes Branch Dirs
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-08-20 13:37:04 +02:00
72430a2d8e
move images to archive if stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-07-30 20:49:32 +02:00
b87065b548
Changed filepath of Config 2023-07-30 20:28:57 +02:00
d86d54d2ec
fixed copy if version is already uploaded 2023-06-02 20:01:50 +02:00
3 changed files with 31 additions and 17 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
target* target*
source* source*
go-gluon-publish

View File

@ -21,7 +21,7 @@ func main() {
br := *branch br := *branch
version := readVersions(*branch) version := readVersions(*branch)
var source_dir_branch string = sdir + br + "/images/" var source_dir_branch string = sdir + br + "/images/"
var target_dir_branch string = tdir + br + "/images/" var target_dir_branch string = tdir + br
if is_firmware_folder(source_dir_branch) { if is_firmware_folder(source_dir_branch) {
//generate manifest file for branch //generate manifest file for branch

View File

@ -19,27 +19,40 @@ func release_branch(b string, sDir string, tDir string, dryrun bool, v string) {
} }
sVersion := GetGluonVersion(sDir) sVersion := GetGluonVersion(sDir)
tVersion := GetGluonVersion(tDir) tVersion := GetGluonVersion(tDir)
fmt.Println("Target Version:", b, tVersion)
fmt.Println("Source Version:", b, sVersion)
fmt.Println("Wanted Version:", b, v)
//check wanted version in target //check wanted version in target
if tVersion != v { if tVersion == v {
log.Println("published version is outdated, try to update from source folder") log.Println(b, "wanted version is already published!")
if sVersion != v { os.Exit(0)
log.Println("wanted Version is not availible in source folder") }
os.Exit(1) log.Println(b, "published version is outdated, try to update from source folder")
} if sVersion != v {
log.Println(b, "wanted Version is not availible in source folder")
os.Exit(1)
} }
if newImages { if newImages {
// delete old firmware files in public folder // delete old firmware files in public folder
for _, file := range check_tDir { // if we are in stable branch, move images to archive
if !(dryrun) { if b == "stable" {
err := os.RemoveAll(tDir + file.Name()) err := os.Rename(tDir+"/*", tDir+"/archive/"+v)
if err != nil { if err != nil {
log.Println("error deleting file: ", err) log.Fatalln(err)
}
} else {
for _, file := range check_tDir {
if !(dryrun) {
err := os.RemoveAll(tDir + "/" + file.Name())
if err != nil {
log.Println("error deleting file: ", err)
} else {
log.Println("removed file: ", file.Name())
}
} else { } else {
log.Println("removed file: ", file.Name()) log.Println("DRYRUN: delete folder :", file.Name())
} }
} else {
log.Println("DRYRUN: delete folder :", file.Name())
} }
} }
@ -56,7 +69,7 @@ func release_branch(b string, sDir string, tDir string, dryrun bool, v string) {
} }
func GetGluonVersion(path string) string { func GetGluonVersion(path string) string {
image_folder := path + "sysupgrade/" image_folder := path + "/sysupgrade/"
files, err := filepath.Glob(filepath.Join(image_folder, "gluon-tdf-*")) files, err := filepath.Glob(filepath.Join(image_folder, "gluon-tdf-*"))
if err != nil { if err != nil {
fmt.Println("Error reading directory: ", err) fmt.Println("Error reading directory: ", err)
@ -76,7 +89,7 @@ func GetGluonVersion(path string) string {
} }
func readVersions(branch string) string { func readVersions(branch string) string {
filePath := "release_state.json" filePath := "/srv/fwuploads-tmp/bin/release_state.json"
v, err := ioutil.ReadFile(filePath) v, err := ioutil.ReadFile(filePath)
if err != nil { if err != nil {
log.Fatalln("Error reading version JSON file!") log.Fatalln("Error reading version JSON file!")