Compare commits

...

2 Commits

Author SHA1 Message Date
068b543bdd feat(config): add support for both .yml and .yaml extension
All checks were successful
Update Child Repos / update (push) Successful in 1m8s
Update the configuration loader to check for both `config.yml` and
`config.yaml` files.
2026-03-05 00:33:07 +01:00
c3bac048fc handle multiple commits
All checks were successful
Update Child Repos / update (push) Successful in 7s
2026-02-17 22:04:52 +01:00
3 changed files with 21 additions and 5 deletions

View File

@@ -25,7 +25,7 @@ jobs:
git config --global user.email "${GIT_EMAIL}" git config --global user.email "${GIT_EMAIL}"
git config --global credential.helper store git config --global credential.helper store
echo "https://${GIT_EMAIL//@/%40}:${GIT_TOKEN}@git.bjphoster.com" > ~/.git-credentials echo "https://${GIT_EMAIL//@/%40}:${GIT_TOKEN}@git.bjphoster.com" > ~/.git-credentials
./update_child_repos.sh ./update_child_repos.sh "${{ github.event.before }}"
env: env:
GIT_NAME: ${{ secrets.GIT_NAME }} GIT_NAME: ${{ secrets.GIT_NAME }}
GIT_EMAIL: ${{ secrets.GIT_EMAIL }} GIT_EMAIL: ${{ secrets.GIT_EMAIL }}

View File

@@ -28,11 +28,23 @@ func (s *WebServer) Initialize() {
} }
s.AppName = "Go Template Container Web Server" s.AppName = "Go Template Container Web Server"
// Attempt to read the config file // Attempt to read the config file (try both config.yml and config.yaml)
var configFile []byte
var configPath string
configFile, err := os.ReadFile("config.yml") configFile, err := os.ReadFile("config.yml")
if err == nil {
configPath = "config.yml"
} else {
configFile, err = os.ReadFile("config.yaml")
if err == nil {
configPath = "config.yaml"
}
}
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
// File does not exist, log and use default config // Neither file exists, log and use default config
fmt.Println("Config file not found, using default settings.") fmt.Println("Config file not found, using default settings.")
} else { } else {
// Some other error occurred when trying to read the file, exit // Some other error occurred when trying to read the file, exit
@@ -43,7 +55,7 @@ func (s *WebServer) Initialize() {
// If the file exists, unmarshal it into the ServiceSettings struct // If the file exists, unmarshal it into the ServiceSettings struct
err = yaml.Unmarshal(configFile, &s) err = yaml.Unmarshal(configFile, &s)
if err != nil { if err != nil {
fmt.Println("Error parsing config file:", err) fmt.Println("Error parsing config file:", configPath, err)
os.Exit(1) os.Exit(1)
} }
} }

View File

@@ -14,7 +14,11 @@ TEMPLATE_BRANCH="main"
CURRENT_COMMIT_ID=$(git rev-parse HEAD) CURRENT_COMMIT_ID=$(git rev-parse HEAD)
COMMIT_MESSAGE="Template updates (commit: ${CURRENT_COMMIT_ID:0:7})" COMMIT_MESSAGE="Template updates (commit: ${CURRENT_COMMIT_ID:0:7})"
PREVIOUS_COMMIT_ID="${1:-}"
if [ -z "${PREVIOUS_COMMIT_ID}" ]; then
PREVIOUS_COMMIT_ID=$(git log --format="%H" -n 2 HEAD | tail -n 1) PREVIOUS_COMMIT_ID=$(git log --format="%H" -n 2 HEAD | tail -n 1)
fi
if [ "${PREVIOUS_COMMIT_ID}" = "${CURRENT_COMMIT_ID}" ]; then if [ "${PREVIOUS_COMMIT_ID}" = "${CURRENT_COMMIT_ID}" ]; then
FILES_CHANGED="" FILES_CHANGED=""