Skip to content

Commit 34c97f2

Browse files
committed
Remove composite action
Signed-off-by: yubiuser <[email protected]>
1 parent 134987e commit 34c97f2

3 files changed

Lines changed: 26 additions & 58 deletions

File tree

.github/actions/login-repo/action.yml

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

.github/dependabot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ updates:
44
- package-ecosystem: "github-actions"
55
directories:
66
- "/"
7-
- "/.github/actions/login-repo/"
87
schedule:
98
interval: "weekly"
109
day: saturday

.github/workflows/ftl-build.yml

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
paths:
77
- 'ftl-build/**'
88
- '.github/workflows/ftl-build.yml'
9-
- '.github/actions/**'
109
tags:
1110
- '**'
1211
# Only run on push events to the main repository (not from forks)
@@ -71,14 +70,20 @@ jobs:
7170
tags: |
7271
type=ref,event=branch,enable=${{ github.event_name != 'schedule' }}
7372
-
74-
name: Login to DockerHub and GitHub Container Registry
75-
if: github.event_name != 'pull_request'
76-
uses: ./.github/actions/login-repo
73+
name: Login to Docker Hub
74+
uses: docker/login-action@v2
75+
with:
76+
registry: docker.io
77+
username: ${{ secrets.DOCKERHUB_USER }}
78+
password: ${{ secrets.DOCKERHUB_PASS }}
79+
80+
-
81+
name: Login to GitHub Container Registry
82+
uses: docker/login-action@v2
7783
with:
78-
docker_username: ${{ secrets.DOCKERHUB_USER }}
79-
docker_password: ${{ secrets.DOCKERHUB_PASS }}
80-
ghcr_username: ${{ github.repository_owner }}
81-
ghcr_password: ${{ secrets.GITHUB_TOKEN }}
84+
registry: ghcr.io
85+
username: ${{ github.repository_owner }}
86+
password: ${{ secrets.GITHUB_TOKEN }}
8287
-
8388
# Add support for more platforms with QEMU (optional)
8489
# https://github.com/docker/setup-qemu-action
@@ -153,13 +158,20 @@ jobs:
153158
name: Set up Docker Buildx
154159
uses: docker/setup-buildx-action@v3
155160
-
156-
name: Login to DockerHub and GitHub Container Registry
157-
uses: ./.github/actions/login-repo
161+
name: Login to Docker Hub
162+
uses: docker/login-action@v2
163+
with:
164+
registry: docker.io
165+
username: ${{ secrets.DOCKERHUB_USER }}
166+
password: ${{ secrets.DOCKERHUB_PASS }}
167+
168+
-
169+
name: Login to GitHub Container Registry
170+
uses: docker/login-action@v2
158171
with:
159-
docker_username: ${{ secrets.DOCKERHUB_USER }}
160-
docker_password: ${{ secrets.DOCKERHUB_PASS }}
161-
ghcr_username: ${{ github.repository_owner }}
162-
ghcr_password: ${{ secrets.GITHUB_TOKEN }}
172+
registry: ghcr.io
173+
username: ${{ github.repository_owner }}
174+
password: ${{ secrets.GITHUB_TOKEN }}
163175
-
164176
name: Docker meta
165177
id: meta_docker

0 commit comments

Comments
 (0)