Skip to content

Commit f597cf4

Browse files
authored
Merge pull request #8 from linuxserver-labs/commits
build commits to master
2 parents 140ac34 + a4d7f6f commit f597cf4

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

.github/workflows/call-baseimage-update.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v6
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
13-
baseimage: "rdesktop-web"
14-
basebranch: "jammy"
13+
baseimage: "kasmvnc"
14+
basebranch: "ubuntujammy"
1515
app_name: "nomacs"
1616
secrets:
1717
repo_release_token: ${{ secrets.repo_release_token }}

.github/workflows/call-build-image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "nomacs"
14-
release_type: "github_tag"
15-
release_url: "https://api.github.com/repos/nomacs/nomacs"
14+
release_type: "github_commit"
15+
release_url: "https://api.github.com/repos/nomacs/nomacs/commits/master"
1616
release_name: ""
1717
target-arch: "64"
1818
secrets:

.github/workflows/call-check-and-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "nomacs"
14-
release_type: "github_tag"
15-
release_url: "https://api.github.com/repos/nomacs/nomacs"
14+
release_type: "github_commit"
15+
release_url: "https://api.github.com/repos/nomacs/nomacs/commits/master"
1616
release_name: ""
1717
secrets:
1818
repo_release_token: ${{ secrets.repo_release_token }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RUN \
5555
make install && \
5656
echo "**** compile nomacs ****" && \
5757
if [ -z "${APP_VERSION}" ]; then \
58-
APP_VERSION=$(curl -sX GET https://api.github.com/repos/nomacs/nomacs/tags | jq -r '.[0] | .name'); \
58+
APP_VERSION=$(curl -sX GET https://api.github.com/repos/nomacs/nomacs/commits/master | jq -r '. | .sha' | cut -c1-8); \
5959
fi && \
6060
mkdir -p /tmp/nomacs && \
6161
git clone --recurse-submodules https://github.com/nomacs/nomacs.git /tmp/nomacs && \

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
254254

255255
## Versions
256256

257-
* **27.03.22:** - Rebase to the new kasmvnc baseimage. Deprecate arm32v7 build as the new base does not support it.
257+
* **10.05.23:** - Build commits from upstream master branch.
258+
* **27.03.23:** - Rebase to the new kasmvnc baseimage. Deprecate arm32v7 build as the new base does not support it.
258259
* **10.12.22:** - Add support for AVIF and JPEG XL.
259260
* **12.10.22:** - Initial Release.

0 commit comments

Comments
 (0)