Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions updater/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ import (
)

const (
linksFile = "links.yml" // social media
releaseFile = "releases.yml" // release notes
commonFile = "common.json" // endonyms & shared links
linksFile = "links.yml" // social media
commonFile = "common.json" // endonyms & shared links
templateSuffix = ".tmpl"
templateDir = "templates"
translationsDir = "translations"
Expand All @@ -30,10 +29,12 @@ var (
debug = false
)

type site map[string]string // an entry for each language
type sites map[string]site // e.g. links.yml
type translations map[string]string // e.g. en.json
type releases []map[string][]string // e.g. releases.yml
type (
site map[string]string // an entry for each language
sites map[string]site // e.g. links.yml
translations map[string]string // e.g. en.json
releases []map[string][]string // e.g. releases.yml
)

// downloads page
type page struct {
Expand Down Expand Up @@ -123,7 +124,7 @@ func makeMinifiedCopy(filepath string) error {
bareName := strings.Replace(filepath, extension, "", -1)
minifiedPath := fmt.Sprintf("%s.min%s", bareName, extension)

err = os.WriteFile(minifiedPath, []byte(minified), 0644)
err = os.WriteFile(minifiedPath, []byte(minified), 0o644)
if err != nil {
return fmt.Errorf("unable to write minified data: %w", err)
}
Expand Down Expand Up @@ -193,15 +194,6 @@ func loadInfo(translationFile string) (page, error) {
fmt.Printf("sites:\n%v\n\n", sites)
}

var releases releases
err = readUnmarshalFile(releaseFile, &releases)
if err != nil {
return page{}, fmt.Errorf("unable to load releases: %w", err)
}
if debug {
fmt.Printf("releases:\n%v\n", releases)
}

// not language specific
var common translations
err = readUnmarshalFile(commonPath, &common)
Expand All @@ -227,7 +219,6 @@ func loadInfo(translationFile string) (page, error) {
Sites: sites,
Common: common,
Translations: translations,
Releases: releases,
}
if debug {
fmt.Printf("page: %+v\n", page)
Expand Down
159 changes: 0 additions & 159 deletions updater/releases.yml

This file was deleted.

9 changes: 1 addition & 8 deletions updater/templates/README.md.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,5 @@
{{- end }}

## Release Notes
{{- range $release := $rl }}
{{- range $version, $notes := $release }}
### {{ $version }}
{{- range $note := $notes }}
- {{ $note }}
{{- end }}
{{- end }}
{{- end }}

- {{ $cm.releases_link }}
11 changes: 6 additions & 5 deletions updater/translations/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,26 @@
"website_link_alt": "https://www.mror.network/",
"faq_link": "https://lantern.io/faq",
"repo_base_link": "https://github.com/getlantern/.github/blob/main",
"releases_link": "https://github.com/getlantern/lantern/releases",
"win10_link_gl": "https://gitlab.com/getlantern/lantern-binaries-mirror/-/raw/master/lantern-installer.exe",
"win10_link_gh": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer.exe",
"win10_link_s3": "https://s3.amazonaws.com/lantern/lantern-installer.exe",
"win10_link_s3": "https://s3.amazonaws.com/lantern.io/releases/production/latest/lantern-installer.exe",
"win10_link_beta": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer-preview.exe",
"win7_link_gh": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer-win7.exe",
"android_link_gl": "https://gitlab.com/getlantern/lantern-binaries-mirror/-/raw/master/lantern-installer.apk",
"android_link_gh": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer.apk",
"android_link_s3": "https://s3.amazonaws.com/lantern/lantern-installer.apk",
"android_link_s3": "https://s3.amazonaws.com/lantern.io/releases/production/latest/lantern-installer.apk",
"android_link_beta": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer-preview.apk",
"android_link_play": "https://play.google.com/store/apps/details?id=org.getlantern.lantern",
"osx_link_gl": "https://gitlab.com/getlantern/lantern-binaries-mirror/-/raw/master/lantern-installer.dmg",
"osx_link_gh": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer.dmg",
"osx_link_s3": "https://s3.amazonaws.com/lantern/lantern-installer.dmg",
"osx_link_s3": "https://s3.amazonaws.com/lantern.io/releases/production/latest/lantern-installer.dmg",
"osx_link_beta": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer-preview.dmg",
"ios_link": "https://apps.apple.com/app/id1457872372?l",
"ubuntu32_link_gh": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer-32-bit.deb",
"ubuntu32_link_s3": "https://s3.amazonaws.com/lantern/lantern-installer-32-bit.deb",
"ubuntu32_link_s3": "https://s3.amazonaws.com/lantern.io/releases/production/latest/lantern-installer.deb",
"ubuntu64_link_gh": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer-64-bit.deb",
"ubuntu64_link_s3": "https://s3.amazonaws.com/lantern/lantern-installer-64-bit.deb",
"ubuntu64_link_s3": "https://s3.amazonaws.com/lantern.io/releases/production/latest/lantern-installer.deb",
"ubuntu32_link_beta": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer-preview-32-bit.deb",
"ubuntu64_link_beta": "https://github.com/getlantern/lantern-binaries/raw/main/lantern-installer-preview-64-bit.deb"
}