Skip to content

Commit 3f6e351

Browse files
authored
Merge pull request #22 from herbetom/change-ci
set timezone, switch to main, bump release action
2 parents 1bdc495 + 7a77fc1 commit 3f6e351

File tree

3 files changed

+47
-5
lines changed

3 files changed

+47
-5
lines changed

.github/build-info.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"gluon": {
33
"repository": "freifunk-gluon/gluon",
4-
"branch": "master",
5-
"commit": "10728bc8a8ae53f0de8e78ef26497b3aa8826b5a"
4+
"branch": "main",
5+
"commit": "d9cfa194c131452bc4f927076f35a8217dc2a483"
66
},
77
"container": {
8-
"version": "master"
8+
"version": "main"
99
},
1010
"build": {
1111
"targets": [

.github/workflows/build.yml

+43-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ jobs:
6565
steps:
6666
- uses: actions/checkout@v4
6767

68+
- name: Set Timezone
69+
run: sudo timedatectl set-timezone Europe/Berlin
70+
71+
- name: Show current Timezone settings
72+
run: timedatectl status
73+
6874
- name: Get build-metadata
6975
id: build-metadata
7076
run: bash .github/build-meta.sh
@@ -91,6 +97,12 @@ jobs:
9197
ref: ${{ needs.build-meta.outputs.gluon-commit }}
9298
path: 'gluon-gha-data/gluon'
9399

100+
- name: Set Timezone
101+
run: sudo timedatectl set-timezone Europe/Berlin
102+
103+
- name: Show current Timezone settings
104+
run: timedatectl status
105+
94106
- name: Get Targets
95107
uses: freifunk-gluon/action-target-list@v1
96108
id: get-targets
@@ -112,6 +124,12 @@ jobs:
112124
ref: ${{ needs.build-meta.outputs.gluon-commit }}
113125
path: 'gluon-gha-data/gluon'
114126

127+
- name: Set Timezone
128+
run: sudo timedatectl set-timezone Europe/Berlin
129+
130+
- name: Show current Timezone settings
131+
run: timedatectl status
132+
115133
- name: Determine Cache-Key
116134
id: cache-key
117135
run: >
@@ -191,6 +209,12 @@ jobs:
191209
fetch-depth: 0
192210
fetch-tags: true
193211

212+
- name: Set Timezone
213+
run: sudo timedatectl set-timezone Europe/Berlin
214+
215+
- name: Show current Timezone settings
216+
run: timedatectl status
217+
194218
- name: Fetch upstream tags
195219
# yamllint disable rule:line-length
196220
if: ${{ needs.build-meta.outputs.gluon-repository != 'freifunk-gluon/gluon' }}
@@ -257,6 +281,12 @@ jobs:
257281
steps:
258282
- uses: actions/checkout@v4
259283

284+
- name: Set Timezone
285+
run: sudo timedatectl set-timezone Europe/Berlin
286+
287+
- name: Show current Timezone settings
288+
run: timedatectl status
289+
260290
- uses: actions/download-artifact@v4
261291
with:
262292
path: "gluon-gha-data/gluon-output"
@@ -425,6 +455,12 @@ jobs:
425455
steps:
426456
- uses: actions/checkout@v4
427457

458+
- name: Set Timezone
459+
run: sudo timedatectl set-timezone Europe/Berlin
460+
461+
- name: Show current Timezone settings
462+
run: timedatectl status
463+
428464
- uses: actions/download-artifact@v4
429465
with:
430466
path: "gluon-gha-data/artifact-download"
@@ -514,6 +550,12 @@ jobs:
514550
steps:
515551
- uses: actions/checkout@v4
516552

553+
- name: Set Timezone
554+
run: sudo timedatectl set-timezone Europe/Berlin
555+
556+
- name: Show current Timezone settings
557+
run: timedatectl status
558+
517559
- uses: actions/download-artifact@v4
518560
with:
519561
path: "gluon-gha-data/artifact-download"
@@ -549,7 +591,7 @@ jobs:
549591
gluon-gha-data/release-notes.md
550592
551593
- name: Create GitHub Release
552-
uses: softprops/action-gh-release@v1
594+
uses: softprops/action-gh-release@v2
553595
with:
554596
name: ${{ needs.build-meta.outputs.release-version }}
555597
# yamllint disable rule:line-length

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you have any questions, please feel welcome to contact the community: [Kontak
1919
## Branches
2020

2121
* `main`:
22-
* matches Gluons `master` branch
22+
* matches Gluons `main` branch
2323
* published as nightly
2424
* firmware version: 2.1.x-yyyymmdd
2525
* `v2023.1.x`:

0 commit comments

Comments
 (0)