Skip to content

Commit 9942b2e

Browse files
committed
Align with redis/docker-library-redis
1 parent dfaf422 commit 9942b2e

File tree

3 files changed

+13
-70
lines changed

3 files changed

+13
-70
lines changed

.github/actions/build-and-tag-locally/action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: Build and Test
32

43
inputs:

.github/actions/create-library-pr/generate-stackbrew-library.sh

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

.github/workflows/pre-merge.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,24 @@ on:
1818

1919
jobs:
2020
build-and-test:
21-
#runs-on: ${{ contains(matrix.platform, 'arm64') && 'ubuntu24-arm64-2-8' || 'ubuntu-latest' }}
22-
runs-on: ["${{ contains(matrix.platform, 'arm64') && 'ARM64' || 'X64' }}", "self-hosted"]
21+
runs-on: ${{ contains(matrix.platform, 'arm64') && 'ubuntu24-arm64-2-8' || 'ubuntu-latest' }}
2322
strategy:
2423
fail-fast: false
2524
matrix:
2625
distribution:
2726
- debian
28-
# - alpine
27+
- alpine
2928
platform:
3029
- linux/amd64
31-
# - linux/i386
32-
# - linux/arm/v5
33-
# - linux/arm/v6
34-
# - linux/arm/v7
35-
# - linux/mips64le
36-
# - linux/ppc64le
37-
# - linux/s390x
30+
- linux/i386
31+
- linux/arm/v5
32+
- linux/arm/v6
33+
- linux/arm/v7
34+
- linux/mips64le
35+
- linux/ppc64le
36+
- linux/s390x
3837
- linux/arm64
39-
# - linux/riscv64
38+
- linux/riscv64
4039
exclude:
4140
- distribution: alpine
4241
platform: linux/mips64le
@@ -59,10 +58,10 @@ jobs:
5958
with:
6059
distribution: ${{ matrix.distribution }}
6160
platform: ${{ matrix.platform }}
62-
registry_username: ${{ vars.REGISTRY_REPOSITORY == 'ghcr.io' && github.actor || vars.REGISTRY_USERNAME }}
63-
registry_password: ${{ vars.REGISTRY_REPOSITORY == 'ghcr.io' && secrets.GITHUB_TOKEN || secrets.REGISTRY_PASSWORD }}
61+
registry_username: ${{ github.actor }}
62+
registry_password: ${{ secrets.GITHUB_TOKEN }}
6463
publish_image: ${{ vars.PUBLISH_IMAGE }}
65-
registry_repository: ${{ vars.REGISTRY_REPOSITORY == 'ghcr.io' && format('ghcr.io/{0}', github.repository) || vars.REGISTRY_REPOSITORY }}
64+
registry_repository: ${{ format('ghcr.io/{0}', github.repository) }}
6665
release_tag: ${{ inputs.release_tag }}
6766

6867
collect-image-urls:

0 commit comments

Comments
 (0)