flynx/photobook
1
0
Fork 0
mirror of https://github.com/flynx/photobook.git synced 2025-10-31 19:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup and minor tweaks...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2023-03-13 16:35:18 +03:00
parent ba90796b22
commit e82f36717b
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/make-dist.yml vendored
View File

@ -21,24 +21,20 @@ jobs:
apk add make git zip apk add make git zip
git config --global --add safe.directory '*' git config --global --add safe.directory '*'
echo "VERSION=$(make version)" >> $GITHUB_ENV echo "VERSION=$(make version)" >> $GITHUB_ENV
COMMENT="$(git log -1 --pretty=%B | grep -v "Signed-off-by:")" # XXX not sure about this...
COMMENT="${COMMENT//'%'/'%25'}" #COMMENT="$(git log -1 --pretty=%B | grep -v "Signed-off-by:")"
COMMENT="${COMMENT//$'\n'/'%0A'}" #COMMENT="${COMMENT//'%'/'%25'}"
COMMENT="${COMMENT//$'\n'/'%0D'}" #COMMENT="${COMMENT//$'\n'/'%0A'}"
echo 'COMMENT<<EOF' >> $GITHUB_ENV #COMMENT="${COMMENT//$'\n'/'%0D'}"
echo "${COMMENT}" >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
# XXX if comment is multi-line it breaks the CTAN announcement...
#echo 'COMMENT<<EOF' >> $GITHUB_ENV #echo 'COMMENT<<EOF' >> $GITHUB_ENV
#git log -1 --pretty=%B | grep -v "Signed-off-by:" >> $GITHUB_ENV #echo "${COMMENT}" >> $GITHUB_ENV
#echo 'EOF' >> $GITHUB_ENV #echo 'EOF' >> $GITHUB_ENV
# XXX if comment is multi-line it breaks the CTAN announcement...
echo 'COMMENT<<EOF' >> $GITHUB_ENV
git log -1 --pretty=%B | grep -v "Signed-off-by:" >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
make dist ctan-dist make dist ctan-dist
- name: TEST
run: |
echo ${{ env.VERSION }}
echo ${{ env.COMMENT }}
- name: Release - name: Release
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')

6
Makefile
View File

@ -45,7 +45,6 @@
.EXPORT_ALL_VARIABLES: .EXPORT_ALL_VARIABLES:
#.ONESHELL:
# NOTE: this makes things run consistently on different systems including # NOTE: this makes things run consistently on different systems including
# things like Android... # things like Android...
@ -60,8 +59,9 @@ MODULE := photobook
VERSION = $(strip $(shell \ VERSION = $(strip $(shell \
cat $(MODULE).cls \ cat $(MODULE).cls \
| grep 'VERSION{' \ | grep 'VERSION{' \
| sed 's/.*{\(.*\)}.*/\1/' \ | sed \
| sed 's/v//')) -e 's/.*{\(.*\)}.*/\1/' \
-e 's/v//'))
DATE = $(strip $(shell date "+%Y%m%d%H%M")) DATE = $(strip $(shell date "+%Y%m%d%H%M"))
COMMIT = $(strip $(shell git rev-parse HEAD)) COMMIT = $(strip $(shell git rev-parse HEAD))