Skip to content

Commit 6bd6010

Browse files
huo-juhuo-ju
authored
Merge pull request #76 from Gaojianli/main
The auto-update/build workflows
2 parents f673a91 + a0a46b3 commit 6bd6010

File tree

6 files changed

+178
-18
lines changed

6 files changed

+178
-18
lines changed

‎.github/workflows/auto_update.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Update Latest
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
UpdateToLatest:
8+
name: Update to Latest
9+
runs-on: ubuntu-latest
10+
permissions:
11+
contents: write
12+
steps:
13+
- uses: actions/checkout@v4
14+
- id: getRelease
15+
name: Fetch latest release
16+
uses: pozetroninc/github-action-get-latest-release@master
17+
with:
18+
repository: photoprism/photoprism
19+
- name: Update Makefile
20+
run: |
21+
export VERSION=`echo "${{ steps.getRelease.outputs.release }}"|cut -d "-" -f 1`
22+
sed -i "s/DISTVERSION=.*/DISTVERSION= g20${VERSION}/g" Makefile
23+
sed -i "s/GH_TAGNAME=.*/GH_TAGNAME= ${{ steps.getRelease.outputs.release }}/g" Makefile
24+
- name: Build The Latest
25+
uses: vmactions/freebsd-vm@v1
26+
with:
27+
usesh: true
28+
prepare: |
29+
pkg install -y gmake npm wget pkgconf git go122 portsnap ffmpeg p5-Image-ExifTool libheif vips bsddialog portconfig
30+
mkdir -p /var/db/portsnap && portsnap --interactive auto > /dev/null
31+
fetch https://github.com/lapo-luchini/libtensorflow1-freebsd-port/releases/download/v1.15.5_2/libtensorflow1-1.15.5_2.pkg-FreeBSD-14.0-amd64-AVX-SSE42.pkg -o /tmp/libtf.pkg
32+
pkg add /tmp/libtf.pkg
33+
run: |
34+
git config --global --add safe.directory /home/runner/work/photoprism-freebsd-port/photoprism-freebsd-port
35+
make makesum
36+
make -j $(nproc)
37+
make makeplist >pkg-plist
38+
tail -n +2 pkg-plist >pkg-plist.tmp
39+
mv pkg-plist.tmp pkg-plist
40+
- name: Show diff
41+
run: git diff
42+
- name: Commit and push
43+
uses: stefanzweifel/git-auto-commit-action@v5
44+
with:
45+
commit_message: "[Auto update] Update to ${{ steps.getRelease.outputs.release }}"
46+
- name: Create Release
47+
uses: softprops/action-gh-release@v2
48+
with:
49+
body: Photoprism ${{ steps.getRelease.outputs.release }} packages for FreeBSD
50+
tag_name: ${{ steps.getRelease.outputs.release }}
51+
name: ${{ steps.getRelease.outputs.release }}

‎.github/workflows/build_pkg.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Create Binary Pkg
2+
3+
on:
4+
workflow_call:
5+
6+
jobs:
7+
build_14:
8+
name: Build for FreeBSD 14
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: Build PKG
13+
uses: vmactions/freebsd-vm@v1
14+
with:
15+
prepare: |
16+
pkg install -y gmake npm wget pkgconf git go122 portsnap ffmpeg p5-Image-ExifTool libheif vips bsddialog portconfig
17+
mkdir -p /var/db/portsnap && portsnap --interactive auto > /dev/null
18+
fetch https://github.com/lapo-luchini/libtensorflow1-freebsd-port/releases/download/v1.15.5_2/libtensorflow1-1.15.5_2.pkg-FreeBSD-14.0-amd64-AVX-SSE42.pkg -o /tmp/libtf.pkg
19+
pkg add /tmp/libtf.pkg
20+
run: |
21+
git config --global --add safe.directory /home/runner/work/photoprism-freebsd-port/photoprism-freebsd-port
22+
make package
23+
python3.11 -c "import glob, os; [os.rename(f, f.replace('.pkg', '-FreeBSD-' + os.uname().release + '.pkg')) for f in glob.glob('work/pkg/*.pkg')]"
24+
- name: Upload build artifacts
25+
uses: actions/upload-artifact@v4
26+
with:
27+
name: freebsd-14
28+
path: |
29+
work/pkg/*.pkg
30+
build_13:
31+
name: Build for FreeBSD 13
32+
runs-on: ubuntu-latest
33+
steps:
34+
- uses: actions/checkout@v4
35+
- name: Build PKG
36+
uses: vmactions/freebsd-vm@v1
37+
with:
38+
release: "13.3"
39+
prepare: |
40+
pkg install -y gmake npm wget pkgconf git go122 ffmpeg p5-Image-ExifTool libheif vips bsddialog portconfig
41+
mkdir -p /var/db/portsnap && portsnap --interactive auto > /dev/null
42+
fetch https://github.com/lapo-luchini/libtensorflow1-freebsd-port/releases/download/v1.15.5_2/libtensorflow1-1.15.5_2.pkg-FreeBSD-13.2-amd64-AVX-SSE42.pkg -o /tmp/libtf.pkg
43+
pkg add /tmp/libtf.pkg
44+
run: |
45+
git config --global --add safe.directory /home/runner/work/photoprism-freebsd-port/photoprism-freebsd-port
46+
make package
47+
python3.11 -c "import glob, os; [os.rename(f, f.replace('.pkg', '-FreeBSD-' + os.uname().release + '.pkg')) for f in glob.glob('work/pkg/*.pkg')]"
48+
- name: Upload build artifacts
49+
uses: actions/upload-artifact@v4
50+
with:
51+
name: freebsd-13
52+
path: |
53+
work/pkg/*.pkg

‎.github/workflows/release.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Release
2+
3+
on:
4+
workflow_dispatch:
5+
release:
6+
types:
7+
- published
8+
workflow_run:
9+
workflows: ["Update Latest"]
10+
types: [completed]
11+
12+
13+
jobs:
14+
Build_Packages:
15+
name: Build Packages
16+
secrets: inherit
17+
permissions:
18+
contents: write
19+
checks: write
20+
actions: read
21+
issues: read
22+
packages: write
23+
pull-requests: read
24+
repository-projects: read
25+
statuses: read
26+
uses: ./.github/workflows/build_pkg.yml
27+
Upload_Artifacts:
28+
name: Upload to release artifacts
29+
needs: Build_Packages
30+
permissions:
31+
contents: write
32+
checks: write
33+
actions: read
34+
issues: read
35+
packages: write
36+
pull-requests: read
37+
repository-projects: read
38+
statuses: read
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/download-artifact@v4
42+
with:
43+
name: freebsd-14
44+
path: target/
45+
- uses: actions/download-artifact@v4
46+
with:
47+
name: freebsd-13
48+
path: target/
49+
- uses: alexellis/upload-assets@0.4.1
50+
env:
51+
GITHUB_TOKEN: ${{ github.token }}
52+
with:
53+
asset_paths: '[ "target/*.pkg" ]'

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# $FreeBSD$
22

33
PORTNAME= photoprism
4-
DISTVERSION= g20240711
4+
DISTVERSION= g20240915
55
CATEGORIES= www
66

77
MAINTAINER= huoju@devep.net
@@ -26,12 +26,12 @@ EXTRACT_DEPENDS= ${RUN_DEPENDS} \
2626

2727
BUILD_DEPENDS= ${EXTRACT_DEPENDS}
2828

29-
USES= gmake go:1.21,modules python:3.6+,build
29+
USES= gmake go:1.22,modules python:3.6+,build
3030

3131
USE_GITHUB= yes
3232
GH_ACCOUNT= photoprism
3333
GH_PROJECT= photoprism
34-
GH_TAGNAME= 240711-2197af848
34+
GH_TAGNAME= 240915-e1280b2fb
3535

3636
USE_RC_SUBR= photoprism
3737
PHOTOPRISM_DATA_DIR= /var/db/photoprism

‎distinfo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1721639281
2-
SHA256 (photoprism-photoprism-g20240711-240711-2197af848_GH0.tar.gz) = 34b29308f64a50d2dbf482ccacbb7b5357e50f97e74a7ce0ee295c0a3bef695a
3-
SIZE (photoprism-photoprism-g20240711-240711-2197af848_GH0.tar.gz) = 64940285
1+
TIMESTAMP = 1727609221
2+
SHA256 (photoprism-photoprism-g20240915-240915-e1280b2fb_GH0.tar.gz) = 11dd12b493f18f44e052ef71b1f29b7b5a4237fc27df3e8afb23c08f2989e369
3+
SIZE (photoprism-photoprism-g20240915-240915-e1280b2fb_GH0.tar.gz) = 65012389

‎pkg-plist‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
bin/photoprism
2+
etc/rc.d/photoprism
23
/var/db/photoprism/assets/.buildignore
34
/var/db/photoprism/assets/README
45
/var/db/photoprism/assets/examples/.photoprism/example.jpg
@@ -112,6 +113,7 @@ bin/photoprism
112113
/var/db/photoprism/assets/locales/fa/default.po
113114
/var/db/photoprism/assets/locales/fi/default.po
114115
/var/db/photoprism/assets/locales/fr/default.po
116+
/var/db/photoprism/assets/locales/ga/default.po
115117
/var/db/photoprism/assets/locales/he/default.po
116118
/var/db/photoprism/assets/locales/hi/default.po
117119
/var/db/photoprism/assets/locales/hr/default.po
@@ -677,12 +679,12 @@ bin/photoprism
677679
/var/db/photoprism/assets/static/build/2d8017489da689caedc1.woff2
678680
/var/db/photoprism/assets/static/build/698bd8550d863c20a3e1.ttf
679681
/var/db/photoprism/assets/static/build/af9a28e7f261a412f581.eot
680-
/var/db/photoprism/assets/static/build/app.1727d6ad9ff7e01d3bf5.js
681-
/var/db/photoprism/assets/static/build/app.1727d6ad9ff7e01d3bf5.js.LICENSE.txt
682-
/var/db/photoprism/assets/static/build/app.fc3e74d7360094f1a4f9.css
682+
/var/db/photoprism/assets/static/build/app.405beb33c06fe9d84f44.css
683+
/var/db/photoprism/assets/static/build/app.7c8896e06308b4527cda.js
684+
/var/db/photoprism/assets/static/build/app.7c8896e06308b4527cda.js.LICENSE.txt
683685
/var/db/photoprism/assets/static/build/assets.json
684686
/var/db/photoprism/assets/static/build/f64c3af3d0d25b9e4e00.svg
685-
/var/db/photoprism/assets/static/build/share.9e32a8334b90c4bf11f3.js
687+
/var/db/photoprism/assets/static/build/share.73a026001890c81ab641.js
686688
/var/db/photoprism/assets/static/build/sw.js
687689
/var/db/photoprism/assets/static/font/Open Sans Bold/0-255.pbf
688690
/var/db/photoprism/assets/static/font/Open Sans Bold/1024-1279.pbf
@@ -698,7 +700,7 @@ bin/photoprism
698700
/var/db/photoprism/assets/static/font/Open Sans Bold/12544-12799.pbf
699701
/var/db/photoprism/assets/static/font/Open Sans Bold/1280-1535.pbf
700702
/var/db/photoprism/assets/static/font/Open Sans Bold/12800-13055.pbf
701-
/var/db/photoprism/assets/static/font/Open Sans Bold/13056-13311.pbf
703+
/var/db/photoprism/assets/static/font/Open Sans Bold/13056-13%%PYTHON_SUFFIX%%.pbf
702704
/var/db/photoprism/assets/static/font/Open Sans Bold/13312-13567.pbf
703705
/var/db/photoprism/assets/static/font/Open Sans Bold/13568-13823.pbf
704706
/var/db/photoprism/assets/static/font/Open Sans Bold/13824-14079.pbf
@@ -836,7 +838,7 @@ bin/photoprism
836838
/var/db/photoprism/assets/static/font/Open Sans Bold/44288-44543.pbf
837839
/var/db/photoprism/assets/static/font/Open Sans Bold/44544-44799.pbf
838840
/var/db/photoprism/assets/static/font/Open Sans Bold/44800-45055.pbf
839-
/var/db/photoprism/assets/static/font/Open Sans Bold/45056-45311.pbf
841+
/var/db/photoprism/assets/static/font/Open Sans Bold/45056-45%%PYTHON_SUFFIX%%.pbf
840842
/var/db/photoprism/assets/static/font/Open Sans Bold/45312-45567.pbf
841843
/var/db/photoprism/assets/static/font/Open Sans Bold/45568-45823.pbf
842844
/var/db/photoprism/assets/static/font/Open Sans Bold/45824-46079.pbf
@@ -954,7 +956,7 @@ bin/photoprism
954956
/var/db/photoprism/assets/static/font/Open Sans Italic/12544-12799.pbf
955957
/var/db/photoprism/assets/static/font/Open Sans Italic/1280-1535.pbf
956958
/var/db/photoprism/assets/static/font/Open Sans Italic/12800-13055.pbf
957-
/var/db/photoprism/assets/static/font/Open Sans Italic/13056-13311.pbf
959+
/var/db/photoprism/assets/static/font/Open Sans Italic/13056-13%%PYTHON_SUFFIX%%.pbf
958960
/var/db/photoprism/assets/static/font/Open Sans Italic/13312-13567.pbf
959961
/var/db/photoprism/assets/static/font/Open Sans Italic/13568-13823.pbf
960962
/var/db/photoprism/assets/static/font/Open Sans Italic/13824-14079.pbf
@@ -1092,7 +1094,7 @@ bin/photoprism
10921094
/var/db/photoprism/assets/static/font/Open Sans Italic/44288-44543.pbf
10931095
/var/db/photoprism/assets/static/font/Open Sans Italic/44544-44799.pbf
10941096
/var/db/photoprism/assets/static/font/Open Sans Italic/44800-45055.pbf
1095-
/var/db/photoprism/assets/static/font/Open Sans Italic/45056-45311.pbf
1097+
/var/db/photoprism/assets/static/font/Open Sans Italic/45056-45%%PYTHON_SUFFIX%%.pbf
10961098
/var/db/photoprism/assets/static/font/Open Sans Italic/45312-45567.pbf
10971099
/var/db/photoprism/assets/static/font/Open Sans Italic/45568-45823.pbf
10981100
/var/db/photoprism/assets/static/font/Open Sans Italic/45824-46079.pbf
@@ -1210,7 +1212,7 @@ bin/photoprism
12101212
/var/db/photoprism/assets/static/font/Open Sans Regular/12544-12799.pbf
12111213
/var/db/photoprism/assets/static/font/Open Sans Regular/1280-1535.pbf
12121214
/var/db/photoprism/assets/static/font/Open Sans Regular/12800-13055.pbf
1213-
/var/db/photoprism/assets/static/font/Open Sans Regular/13056-13311.pbf
1215+
/var/db/photoprism/assets/static/font/Open Sans Regular/13056-13%%PYTHON_SUFFIX%%.pbf
12141216
/var/db/photoprism/assets/static/font/Open Sans Regular/13312-13567.pbf
12151217
/var/db/photoprism/assets/static/font/Open Sans Regular/13568-13823.pbf
12161218
/var/db/photoprism/assets/static/font/Open Sans Regular/13824-14079.pbf
@@ -1348,7 +1350,7 @@ bin/photoprism
13481350
/var/db/photoprism/assets/static/font/Open Sans Regular/44288-44543.pbf
13491351
/var/db/photoprism/assets/static/font/Open Sans Regular/44544-44799.pbf
13501352
/var/db/photoprism/assets/static/font/Open Sans Regular/44800-45055.pbf
1351-
/var/db/photoprism/assets/static/font/Open Sans Regular/45056-45311.pbf
1353+
/var/db/photoprism/assets/static/font/Open Sans Regular/45056-45%%PYTHON_SUFFIX%%.pbf
13521354
/var/db/photoprism/assets/static/font/Open Sans Regular/45312-45567.pbf
13531355
/var/db/photoprism/assets/static/font/Open Sans Regular/45568-45823.pbf
13541356
/var/db/photoprism/assets/static/font/Open Sans Regular/45824-46079.pbf
@@ -1466,7 +1468,7 @@ bin/photoprism
14661468
/var/db/photoprism/assets/static/font/Open Sans Semibold/12544-12799.pbf
14671469
/var/db/photoprism/assets/static/font/Open Sans Semibold/1280-1535.pbf
14681470
/var/db/photoprism/assets/static/font/Open Sans Semibold/12800-13055.pbf
1469-
/var/db/photoprism/assets/static/font/Open Sans Semibold/13056-13311.pbf
1471+
/var/db/photoprism/assets/static/font/Open Sans Semibold/13056-13%%PYTHON_SUFFIX%%.pbf
14701472
/var/db/photoprism/assets/static/font/Open Sans Semibold/13312-13567.pbf
14711473
/var/db/photoprism/assets/static/font/Open Sans Semibold/13568-13823.pbf
14721474
/var/db/photoprism/assets/static/font/Open Sans Semibold/13824-14079.pbf
@@ -1604,7 +1606,7 @@ bin/photoprism
16041606
/var/db/photoprism/assets/static/font/Open Sans Semibold/44288-44543.pbf
16051607
/var/db/photoprism/assets/static/font/Open Sans Semibold/44544-44799.pbf
16061608
/var/db/photoprism/assets/static/font/Open Sans Semibold/44800-45055.pbf
1607-
/var/db/photoprism/assets/static/font/Open Sans Semibold/45056-45311.pbf
1609+
/var/db/photoprism/assets/static/font/Open Sans Semibold/45056-45%%PYTHON_SUFFIX%%.pbf
16081610
/var/db/photoprism/assets/static/font/Open Sans Semibold/45312-45567.pbf
16091611
/var/db/photoprism/assets/static/font/Open Sans Semibold/45568-45823.pbf
16101612
/var/db/photoprism/assets/static/font/Open Sans Semibold/45824-46079.pbf
@@ -1978,6 +1980,7 @@ bin/photoprism
19781980
@dir /var/db/photoprism/assets/locales/fa
19791981
@dir /var/db/photoprism/assets/locales/fi
19801982
@dir /var/db/photoprism/assets/locales/fr
1983+
@dir /var/db/photoprism/assets/locales/ga
19811984
@dir /var/db/photoprism/assets/locales/he
19821985
@dir /var/db/photoprism/assets/locales/hi
19831986
@dir /var/db/photoprism/assets/locales/hr

0 commit comments

Comments
 (0)