Skip to content

Commit c89b01f

Browse files
committed
update workflows.
1 parent 4150ac4 commit c89b01f

File tree

6 files changed

+37
-61
lines changed

6 files changed

+37
-61
lines changed
Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "amd64 images"
1+
name: Build and Push to GHCR
22

33
on:
44
push:
@@ -7,13 +7,14 @@ on:
77

88
jobs:
99
build-base:
10+
name: Build Base Image
1011
uses: ./.github/workflows/image_base.yml
1112
with:
12-
platforms: linux/amd64
13-
dockerfile: Dockerfile
13+
platforms: linux/amd64,linux/arm64,linux/arm/v7
1414
secrets: inherit
1515

1616
build-apps:
17+
name: Build Apps Image
1718
uses: ./.github/workflows/image_app.yml
1819
needs: build-base
1920
strategy:
@@ -22,21 +23,34 @@ jobs:
2223
matrix:
2324
include:
2425
- name: firefox
26+
platforms: linux/amd64,linux/arm64,linux/arm/v7
2527
- name: waterfox
28+
platforms: linux/amd64
2629
- name: chromium
30+
platforms: linux/amd64,linux/arm64,linux/arm/v7
2731
- name: google-chrome
32+
platforms: linux/amd64
2833
- name: ungoogled-chromium
34+
platforms: linux/amd64
2935
- name: microsoft-edge
36+
platforms: linux/amd64
3037
- name: brave
38+
platforms: linux/amd64
3139
- name: vivaldi
40+
platforms: linux/amd64
3241
- name: opera
42+
platforms: linux/amd64
3343
- name: tor-browser
44+
platforms: linux/amd64
3445
- name: remmina
46+
platforms: linux/amd64
3547
- name: vlc
48+
platforms: linux/amd64,linux/arm64,linux/arm/v7
3649
- name: xfce
50+
platforms: linux/amd64,linux/arm64,linux/arm/v7
3751
- name: kde
52+
platforms: linux/amd64
3853
with:
3954
name: ${{ matrix.name }}
40-
dockerfile: ${{ matrix.dockerfile }}
41-
platforms: linux/amd64
55+
platforms: ${{ matrix.platforms }}
4256
secrets: inherit

.github/workflows/ghcr_arm.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/ghcr_intel.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "intel gpu supported images"
1+
name: Build and Push to GHCR for Intel
22

33
on:
44
push:
@@ -7,6 +7,7 @@ on:
77

88
jobs:
99
build-base:
10+
name: Build Base Image
1011
uses: ./.github/workflows/image_base.yml
1112
with:
1213
flavor: intel
@@ -15,6 +16,7 @@ jobs:
1516
secrets: inherit
1617

1718
build-apps:
19+
name: Build Apps Image
1820
uses: ./.github/workflows/image_app.yml
1921
needs: build-base
2022
strategy:
@@ -38,7 +40,7 @@ jobs:
3840
- name: kde
3941
with:
4042
name: ${{ matrix.name }}
41-
dockerfile: ${{ matrix.dockerfile }}
4243
flavor: intel
4344
platforms: linux/amd64
45+
dockerfile: ${{ matrix.dockerfile }}
4446
secrets: inherit

.github/workflows/ghcr_nvidia.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "nvidia gpu supported images"
1+
name: Build and Push to GHCR for Nvidia
22

33
on:
44
push:
@@ -7,6 +7,7 @@ on:
77

88
jobs:
99
build-base:
10+
name: Build Base Image
1011
uses: ./.github/workflows/image_base.yml
1112
with:
1213
flavor: nvidia
@@ -15,6 +16,7 @@ jobs:
1516
secrets: inherit
1617

1718
build-apps:
19+
name: Build Apps Image
1820
uses: ./.github/workflows/image_app.yml
1921
needs: build-base
2022
strategy:
@@ -34,7 +36,7 @@ jobs:
3436
dockerfile: Dockerfile.nvidia
3537
with:
3638
name: ${{ matrix.name }}
37-
dockerfile: ${{ matrix.dockerfile }}
3839
flavor: nvidia
3940
platforms: linux/amd64
41+
dockerfile: ${{ matrix.dockerfile }}
4042
secrets: inherit

.github/workflows/image_app.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ on:
77
required: true
88
type: string
99
description: "The name of the application to build."
10-
dockerfile:
11-
required: false
12-
type: string
13-
default: "Dockerfile"
14-
description: "The Dockerfile to use for building the image."
1510
flavor:
1611
required: false
1712
type: string
@@ -22,10 +17,11 @@ on:
2217
type: string
2318
default: "linux/amd64"
2419
description: "The platforms to build for."
25-
secrets:
26-
GHCR_ACCESS_TOKEN:
27-
required: true
28-
description: "GitHub Container Registry access token."
20+
dockerfile:
21+
required: false
22+
type: string
23+
default: "Dockerfile"
24+
description: "The Dockerfile to use for building the image."
2925

3026
env:
3127
FLAVOR_PREFIX: ${{ inputs.flavor && format('{0}-', inputs.flavor) || '' }}

.github/workflows/image_base.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ name: Build and Publish Base Image
33
on:
44
workflow_call:
55
inputs:
6-
dockerfile:
7-
required: false
8-
type: string
9-
default: "Dockerfile"
10-
description: "The Dockerfile to use for building the image."
116
flavor:
127
required: false
138
type: string
@@ -18,10 +13,11 @@ on:
1813
type: string
1914
default: "linux/amd64"
2015
description: "The platforms to build for."
21-
secrets:
22-
GHCR_ACCESS_TOKEN:
23-
required: true
24-
description: "GitHub Container Registry access token."
16+
dockerfile:
17+
required: false
18+
type: string
19+
default: "Dockerfile"
20+
description: "The Dockerfile to use for building the image."
2521

2622
env:
2723
FLAVOR_PREFIX: ${{ inputs.flavor && format('{0}-', inputs.flavor) || '' }}

0 commit comments

Comments
 (0)