Skip to content

Commit d2e97b2

Browse files
committed
update workflows
Signed-off-by: Balazs Nadasdi <[email protected]>
1 parent 4dc20a1 commit d2e97b2

File tree

4 files changed

+23
-0
lines changed

4 files changed

+23
-0
lines changed

Diff for: .github/workflows/build-and-publish.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ permissions:
1010

1111
env:
1212
CONTROLLER: ${{ github.event.repository.name }}
13+
LIBCRYTO_VERSION: "3.1.3-r0"
1314

1415
jobs:
1516
test:
@@ -72,6 +73,8 @@ jobs:
7273
builder: ${{ steps.buildx.outputs.name }}
7374
context: .
7475
file: ./Dockerfile
76+
build-args: |
77+
LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }}
7578
platforms: linux/amd64,linux/arm64 #,linux/arm/v7
7679
tags: |
7780
ghcr.io/weaveworks/${{ env.CONTROLLER }}:${{ steps.prep.outputs.VERSION }}
@@ -89,6 +92,8 @@ jobs:
8992
builder: ${{ steps.buildx.outputs.name }}
9093
context: .
9194
file: ./runner-base.Dockerfile
95+
build-args: |
96+
LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }}
9297
platforms: linux/amd64,linux/arm64 #,linux/arm/v7
9398
tags: |
9499
ghcr.io/weaveworks/tf-runner:${{ steps.prep.outputs.VERSION }}-base
@@ -126,6 +131,8 @@ jobs:
126131
context: .
127132
file: ./planner.Dockerfile
128133
platforms: linux/amd64,linux/arm64 #,linux/arm/v7
134+
build-args: |
135+
LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }}
129136
tags: |
130137
ghcr.io/weaveworks/branch-planner:${{ steps.prep.outputs.VERSION }}
131138
labels: |

Diff for: .github/workflows/release-runners.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ permissions:
1818
env:
1919
VERSION: ${{ github.event.inputs.version }}
2020
BUILD_DATE: ${{ github.event.inputs.build_date }}
21+
LIBCRYTO_VERSION: "3.1.3-r0"
2122

2223
jobs:
2324
release-base:
@@ -52,6 +53,8 @@ jobs:
5253
builder: ${{ steps.buildx.outputs.name }}
5354
context: .
5455
file: ./runner-base.Dockerfile
56+
build-args: |
57+
LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }}
5558
platforms: linux/amd64,linux/arm64 #,linux/arm/v7
5659
tags: |
5760
ghcr.io/weaveworks/tf-runner:${{ env.VERSION }}-base
@@ -103,6 +106,7 @@ jobs:
103106
build-args: |
104107
BASE_IMAGE=ghcr.io/weaveworks/tf-runner:${{ env.VERSION }}-base
105108
TF_VERSION=${{ matrix.tf_version }}
109+
LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }}
106110
tags: |
107111
ghcr.io/weaveworks/tf-runner:${{ env.VERSION }}-tf-${{ matrix.tf_version }}
108112
labels: |

Diff for: .github/workflows/release.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212

1313
permissions:
1414
contents: read # for actions/checkout to fetch code
15+
LIBCRYTO_VERSION: "3.1.3-r0"
1516

1617
env:
1718
CONTROLLER: ${{ github.event.repository.name }}
@@ -68,6 +69,8 @@ jobs:
6869
builder: ${{ steps.buildx.outputs.name }}
6970
context: .
7071
file: ./Dockerfile
72+
build-args: |
73+
LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }}
7174
platforms: linux/amd64,linux/arm64 #,linux/arm/v7
7275
tags: |
7376
ghcr.io/weaveworks/${{ env.CONTROLLER }}:${{ steps.prep.outputs.VERSION }}
@@ -86,6 +89,8 @@ jobs:
8689
builder: ${{ steps.buildx.outputs.name }}
8790
context: .
8891
file: ./runner-base.Dockerfile
92+
build-args: |
93+
LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }}
8994
platforms: linux/amd64,linux/arm64 #,linux/arm/v7
9095
tags: |
9196
ghcr.io/weaveworks/tf-runner:${{ steps.prep.outputs.VERSION }}-base
@@ -146,6 +151,8 @@ jobs:
146151
builder: ${{ steps.buildx.outputs.name }}
147152
context: .
148153
file: ./planner.Dockerfile
154+
build-args: |
155+
LIBCRYTO_VERSION=${{ env.LIBCRYTO_VERSION }}
149156
platforms: linux/amd64,linux/arm64 #,linux/arm/v7 - azure-cli does not install correctly on 32 bit arm
150157
tags: |
151158
ghcr.io/weaveworks/branch-planner:${{ steps.prep.outputs.VERSION }}

Diff for: Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ BRANCH_PLANNER_IMAGE ?= ghcr.io/weaveworks/branch-planner
77
TAG ?= latest
88
BUILD_SHA ?= $(shell git rev-parse --short HEAD)
99
BUILD_VERSION ?= $(shell git describe --tags $$(git rev-list --tags --max-count=1))
10+
11+
# Update the following files too:
12+
# - .github/workflows/build-and-publish.yaml
13+
# - .github/workflows/release-runners.yaml
14+
# - .github/workflows/release.yaml
1015
LIBCRYTO_VERSION ?= 3.1.3-r0
1116

1217
# source controller version

0 commit comments

Comments
 (0)