Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
nedex committed Oct 20, 2024
2 parents 11b9897 + 6d88bbb commit 040b886
Show file tree
Hide file tree
Showing 9 changed files with 102 additions and 33 deletions.
1 change: 1 addition & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM devkitpro/devkita64
12 changes: 12 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"build": {
"dockerfile": "Dockerfile"
},
"customizations": {
"vscode": {
"extensions": [
"ms-vscode.cpptools"
]
}
}
}
41 changes: 41 additions & 0 deletions .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
name: Build dev branch and upload

on:
push:
branches:
- dev

jobs:
build:
runs-on: ubuntu-latest
container: devkitpro/devkita64

steps:
- name: Show environment info
run: dkp-pacman -Q

- name: Checkout project
uses: actions/checkout@v4
with:
submodules: recursive
ref: dev

- name: Build project
run: make

- name: Create release structure
run: |
mkdir -p release/switch/.overlays
cp QuickNTP.ovl release/switch/.overlays/
- name: Read app version from makefile
run: |
echo "version=$(make print-APP_VERSION)" >> $GITHUB_ENV
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: quickntp-${{ env.version }}-dev
path: release/
include-hidden-files: true
40 changes: 40 additions & 0 deletions .github/workflows/build-master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
name: Build master branch and upload

on:
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
container: devkitpro/devkita64

steps:
- name: Show environment info
run: dkp-pacman -Q

- name: Checkout project
uses: actions/checkout@v4
with:
submodules: recursive

- name: Build project
run: make

- name: Create release structure
run: |
mkdir -p release/switch/.overlays
cp QuickNTP.ovl release/switch/.overlays/
- name: Read app version from makefile
run: |
echo "version=$(make print-APP_VERSION)" >> $GITHUB_ENV
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: quickntp-${{ env.version }}
path: release/
include-hidden-files: true
26 changes: 0 additions & 26 deletions .github/workflows/main.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
"type": "shell",
"command": "make clean",
"problemMatcher": ["$gcc"]
},
{
"label": "Docker make",
"type": "shell",
"command": "docker run --rm -v ${PWD}:/${workspaceFolderBasename} -w /${workspaceFolderBasename} devkitpro/devkita64 make clean && make"
}
]
}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [1.2.8-1] - 2024-10-20

- libnx @ [v4.7.0](https://github.com/switchbrew/libnx/releases/tag/v4.7.0)

## [1.2.8] - 2023-04-03

### Updated
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ include $(DEVKITPRO)/libnx/switch_rules
# NACP building is skipped as well.
#---------------------------------------------------------------------------------
APP_TITLE := QuickNTP
APP_VERSION := 1.2.8
APP_VERSION := 1.2.8-1

TARGET := $(notdir $(CURDIR))
BUILD := build
Expand Down Expand Up @@ -206,3 +206,5 @@ $(OFILES_SRC) : $(HFILES_BIN)
#---------------------------------------------------------------------------------------
endif
#---------------------------------------------------------------------------------------

print-% : ; @echo $($*)
2 changes: 1 addition & 1 deletion source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class NtpGui : public tsl::Gui {
serverNames(vectorPairKeys(NTPSERVERS)) {}

virtual tsl::elm::Element* createUI() override {
auto frame = new tsl::elm::CustomOverlayFrame("QuickNTP", "by NedEX - v1.2.8");
auto frame = new tsl::elm::CustomOverlayFrame("QuickNTP", "by NedEX - v1.2.8-1");

auto list = new tsl::elm::List();

Expand Down

0 comments on commit 040b886

Please sign in to comment.