Skip to content

Commit 7c9896d

Browse files
committed
Undo repository variables as only maintainers can then modify them
1 parent 13441e8 commit 7c9896d

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

.github/workflows/debian.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
# Build Docker images for Debian with different versions of GCC and Clang and
2-
# push them to the GitHub Container Registry.
3-
# Note: Some environment variables used in the workflow are defined in the repo
4-
# settings at https://github.com/XRPLF/ci/settings/variables/actions.
51
name: Debian
62

73
on:
@@ -11,8 +7,10 @@ on:
117
- docker/debian/Dockerfile
128

139
env:
10+
DOCKER_REGISTRY: ghcr.io
1411
DOCKER_BUILDKIT: 1
1512
BUILDKIT_PROGRESS: plain
13+
CONAN_VERSION: 2.17.0
1614

1715
jobs:
1816
# Build the Docker image for Debian using different versions of GCC.
@@ -31,17 +29,17 @@ jobs:
3129
- name: Checkout repository
3230
uses: actions/checkout@v4
3331
- name: Login to GitHub Container Registry
34-
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${{ env.DOCKER_REGISTRY }} -u ${{ github.repository_owner }} --password-stdin
32+
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${DOCKER_REGISTRY} -u ${{ github.repository_owner }} --password-stdin
3533
- name: Determine the Docker image name.
3634
run: |
3735
# Convert the repository name to lowercase as the organization name is
3836
# uppercase, which is not permitted by the Docker registry.
3937
DOCKER_REPOSITORY=${GITHUB_REPOSITORY,,}
40-
echo "DOCKER_IMAGE=${{ env.DOCKER_REGISTRY }}/${DOCKER_REPOSITORY}/debian-${{ matrix.version.os }}:gcc${{ matrix.version.gcc }}" >> $GITHUB_ENV
38+
echo "DOCKER_IMAGE=${DOCKER_REGISTRY}/${DOCKER_REPOSITORY}/debian-${{ matrix.version.os }}:gcc${{ matrix.version.gcc }}" >> $GITHUB_ENV
4139
- name: Build the Docker image
4240
working-directory: docker/debian
4341
run: |
44-
docker build . \
42+
DOCKER_BUILDKIT=1 docker build . \
4543
--target gcc \
4644
--build-arg GITHUB_REPO=${GITHUB_REPOSITORY} \
4745
--build-arg DEBIAN_VERSION=${{ matrix.version.os }} \
@@ -71,13 +69,13 @@ jobs:
7169
- name: Checkout repository
7270
uses: actions/checkout@v4
7371
- name: Login to GitHub Container Registry
74-
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${{ env.DOCKER_REGISTRY }} -u ${{ github.repository_owner }} --password-stdin
72+
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${DOCKER_REGISTRY} -u ${{ github.repository_owner }} --password-stdin
7573
- name: Determine the Docker image name.
7674
run: |
7775
# Convert the repository name to lowercase as the organization name is
7876
# uppercase, which is not permitted by the Docker registry.
7977
DOCKER_REPOSITORY=${GITHUB_REPOSITORY,,}
80-
echo "DOCKER_IMAGE=${{ env.DOCKER_REGISTRY }}/${DOCKER_REPOSITORY}/debian-${{ matrix.version.os }}:clang${{ matrix.version.clang }}" >> $GITHUB_ENV
78+
echo "DOCKER_IMAGE=${DOCKER_REGISTRY}/${DOCKER_REPOSITORY}/debian-${{ matrix.version.os }}:clang${{ matrix.version.clang }}" >> $GITHUB_ENV
8179
- name: Build the Docker image
8280
working-directory: docker/debian
8381
run: |

.github/workflows/ubuntu.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
# Build Docker images for Ubuntu with different versions of GCC and Clang and
2-
# push them to the GitHub Container Registry.
3-
# Note: Some environment variables used in the workflow are defined in the repo
4-
# settings at https://github.com/XRPLF/ci/settings/variables/actions.
51
name: Ubuntu
62

73
on:
@@ -11,8 +7,10 @@ on:
117
- docker/ubuntu/Dockerfile
128

139
env:
10+
DOCKER_REGISTRY: ghcr.io
1411
DOCKER_BUILDKIT: 1
1512
BUILDKIT_PROGRESS: plain
13+
CONAN_VERSION: 2.17.0
1614

1715
jobs:
1816
# Build the Docker image for Ubuntu using different versions of GCC. See
@@ -32,17 +30,17 @@ jobs:
3230
- name: Checkout repository
3331
uses: actions/checkout@v4
3432
- name: Login to GitHub Container Registry
35-
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${{ env.DOCKER_REGISTRY }} -u ${{ github.repository_owner }} --password-stdin
33+
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${DOCKER_REGISTRY} -u ${{ github.repository_owner }} --password-stdin
3634
- name: Determine the Docker image name.
3735
run: |
3836
# Convert the repository name to lowercase as the organization name is
3937
# uppercase, which is not permitted by the Docker registry.
4038
DOCKER_REPOSITORY=${GITHUB_REPOSITORY,,}
41-
echo "DOCKER_IMAGE=${{ env.DOCKER_REGISTRY }}/${DOCKER_REPOSITORY}/ubuntu-${{ matrix.version.os }}:gcc${{ matrix.version.gcc }}" >> $GITHUB_ENV
39+
echo "DOCKER_IMAGE=${DOCKER_REGISTRY}/${DOCKER_REPOSITORY}/ubuntu-${{ matrix.version.os }}:gcc${{ matrix.version.gcc }}" >> $GITHUB_ENV
4240
- name: Build the Docker image
4341
working-directory: docker/ubuntu
4442
run: |
45-
docker build . \
43+
DOCKER_BUILDKIT=1 docker build . \
4644
--target gcc \
4745
--build-arg GITHUB_REPO=${GITHUB_REPOSITORY} \
4846
--build-arg UBUNTU_VERSION=${{ matrix.version.os }} \
@@ -71,13 +69,13 @@ jobs:
7169
- name: Checkout repository
7270
uses: actions/checkout@v4
7371
- name: Login to GitHub Container Registry
74-
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${{ env.DOCKER_REGISTRY }} -u ${{ github.repository_owner }} --password-stdin
72+
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${DOCKER_REGISTRY} -u ${{ github.repository_owner }} --password-stdin
7573
- name: Determine the Docker image name.
7674
run: |
7775
# Convert the repository name to lowercase as the organization name is
7876
# uppercase, which is not permitted by the Docker registry.
7977
DOCKER_REPOSITORY=${GITHUB_REPOSITORY,,}
80-
echo "DOCKER_IMAGE=${{ env.DOCKER_REGISTRY }}/${DOCKER_REPOSITORY}/ubuntu-${{ matrix.version.os }}:clang${{ matrix.version.clang }}" >> $GITHUB_ENV
78+
echo "DOCKER_IMAGE=${DOCKER_REGISTRY}/${DOCKER_REPOSITORY}/ubuntu-${{ matrix.version.os }}:clang${{ matrix.version.clang }}" >> $GITHUB_ENV
8179
- name: Build the Docker image
8280
working-directory: docker/ubuntu
8381
run: |

0 commit comments

Comments
 (0)