Skip to content

Commit

Permalink
Merge pull request #77 from blocktrron/v2023.2.x-ci-site-version
Browse files Browse the repository at this point in the history
site ci: obtain site-version from latest tag
  • Loading branch information
blocktrron authored Jun 14, 2024
2 parents f97edeb + 1b923e4 commit 154b691
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
17 changes: 17 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,23 @@ jobs:
name: Determine build-meta
steps:
- uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0

- name: Set Timezone
run: sudo timedatectl set-timezone Europe/Berlin

- name: Show current Timezone settings
run: timedatectl status

- name: Fetch upstream tags
# yamllint disable rule:line-length
if: ${{ github.repository != 'freifunk-darmstadt/site-ffda' }}
run: |
git remote add upstream https://github.com/freifunk-darmstadt/site-ffda.git
git fetch upstream --tags
# yamllint enable rule:line-length

- name: Get build-metadata
id: build-metadata
Expand Down
3 changes: 2 additions & 1 deletion site.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FFDA_SITE_VERSION := 3.0.3
FFDA_SITE_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
FFDA_SITE_VERSION := $(shell git -C $(FFDA_SITE_DIR) describe --tags --abbrev=0 | sed 's/-.*//')

DEFAULT_GLUON_RELEASE := $(FFDA_SITE_VERSION)~$(shell date '+%Y%m%d')
DEFAULT_GLUON_PRIORITY := 0
Expand Down

0 comments on commit 154b691

Please sign in to comment.