Skip to content

Commit

Permalink
github: use upstream Docker containers
Browse files Browse the repository at this point in the history
  • Loading branch information
grische committed Jun 7, 2024
1 parent ef0eedd commit 066040c
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 2 deletions.
28 changes: 27 additions & 1 deletion .github/workflows/firmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,38 @@ jobs:
echo "target={\"target\": $(echo $target_list)}" >> $GITHUB_OUTPUT
echo "build_target={\"target\": $(echo $target_list)}" >> $GITHUB_OUTPUT
get_gluon_tag:
runs-on: ubuntu-latest
outputs:
closest_gluon_tag: ${{ steps.set_gluon_tag.outputs.gluon_git_tag }}
steps:
- name: Set Gluon ref
id: set_gluon_ref
shell: bash
run: |
echo "gluon_git_ref=$(cat gluon-git-ref | tr -d '\n')" >> $GITHUB_OUTPUT
- name: Checkout
uses: actions/checkout@v4
with:
repository: 'freifunk-gluon/gluon'
ref: "${gluon_git_ref}"
fetch-tags: true
- name: Set Gluon tag
id: set_gluon_tag
shell: bash
run: |
echo "gluon_git_tag=$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT
build_firmware:
needs: generate_target_matrix
needs:
- generate_target_matrix
- get_gluon_tag
strategy:
fail-fast: false
matrix: ${{ fromJson(needs.generate_target_matrix.outputs.build_target_json) }}
runs-on: ubuntu-latest
container:
image: ghcr.io/freifunk-gluon/gluon-build:${{ needs.get_gluon_tag.outputs.closest_gluon_tag }}
steps:
- name: Maximize build space
run: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := v2023.1.2
GLUON_GIT_REF := $(shell cat gluon-git-ref | tr -d '\n')

PATCH_DIR := ./patches
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
Expand Down
1 change: 1 addition & 0 deletions gluon-git-ref
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v2023.1.2

0 comments on commit 066040c

Please sign in to comment.