Skip to content

Commit d0082d8

Browse files
chore(wf): restore originals
1 parent e1c344a commit d0082d8

File tree

4 files changed

+335
-320
lines changed

4 files changed

+335
-320
lines changed

.github/workflows/build-dev-latest.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
name: Build latest image
23

34
on:
@@ -11,6 +12,7 @@ permissions:
1112
contents: write
1213

1314
jobs:
15+
1416
check_source:
1517
name: "Run code checks"
1618
uses: ./.github/workflows/_shared-check.yaml
@@ -23,6 +25,9 @@ jobs:
2325
ref: ${{ github.sha }}
2426
release: "snapshot"
2527
docker: true
26-
docker_repository: "ghcr.io/noku-team/assertoor"
28+
docker_repository: "ethpandaops/assertoor"
2729
docker_tag_prefix: "master"
2830
additional_tags: "['master','master-latest','latest']"
31+
secrets:
32+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
33+
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/build-dev.yml

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
name: Build PR
23

34
on:
@@ -23,41 +24,41 @@ jobs:
2324
build_docker: ${{ steps.loadinfo.outputs.build_docker }}
2425
docker_tag: ${{ steps.loadinfo.outputs.docker_tag }}
2526
steps:
26-
- name: "Load PR info"
27-
id: loadinfo
28-
run: |
29-
has_docker_image_label="${{ contains(github.event.pull_request.labels.*.name, 'build-docker-image') }}"
30-
run_builds="$has_docker_image_label"
31-
echo "docker image label: $has_docker_image_label"
32-
33-
branch_name="${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
34-
echo "branch name: $branch_name"
35-
36-
commit_repo="$GITHUB_REPOSITORY"
37-
commit_ref="${{ github.event.pull_request.head.sha }}"
38-
if [[ -z "$commit_ref" ]]; then
39-
commit_ref="${{ github.sha }}"
40-
fi
27+
- name: "Load PR info"
28+
id: loadinfo
29+
run: |
30+
has_docker_image_label="${{ contains(github.event.pull_request.labels.*.name, 'build-docker-image') }}"
31+
run_builds="$has_docker_image_label"
32+
echo "docker image label: $has_docker_image_label"
4133
42-
echo "repository: $commit_repo"
43-
echo "commit: $commit_ref"
34+
branch_name="${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
35+
echo "branch name: $branch_name"
4436
45-
manual_tag="${{ inputs.docker_tag }}"
46-
if [[ ! -z "$manual_tag" ]]; then
47-
has_docker_image_label="true"
48-
branch_name="$manual_tag"
49-
run_builds="true"
50-
fi
37+
commit_repo="$GITHUB_REPOSITORY"
38+
commit_ref="${{ github.event.pull_request.head.sha }}"
39+
if [[ -z "$commit_ref" ]]; then
40+
commit_ref="${{ github.sha }}"
41+
fi
42+
43+
echo "repository: $commit_repo"
44+
echo "commit: $commit_ref"
45+
46+
manual_tag="${{ inputs.docker_tag }}"
47+
if [[ ! -z "$manual_tag" ]]; then
48+
has_docker_image_label="true"
49+
branch_name="$manual_tag"
50+
run_builds="true"
51+
fi
5152
52-
if [[ "$branch_name" == "master" ]] || [[ "$branch_name" =~ ^v[0-9] ]]; then
53-
echo "Invalid branch name! Skipping builds"
54-
run_builds="false"
55-
fi
53+
if [[ "$branch_name" == "master" ]] || [[ "$branch_name" =~ ^v[0-9] ]]; then
54+
echo "Invalid branch name! Skipping builds"
55+
run_builds="false"
56+
fi
5657
57-
echo "run_builds=$run_builds" >> $GITHUB_OUTPUT
58-
echo "commit_ref=$commit_ref" >> $GITHUB_OUTPUT
59-
echo "build_docker=$has_docker_image_label" >> $GITHUB_OUTPUT
60-
echo "docker_tag=$branch_name" >> $GITHUB_OUTPUT
58+
echo "run_builds=$run_builds" >> $GITHUB_OUTPUT
59+
echo "commit_ref=$commit_ref" >> $GITHUB_OUTPUT
60+
echo "build_docker=$has_docker_image_label" >> $GITHUB_OUTPUT
61+
echo "docker_tag=$branch_name" >> $GITHUB_OUTPUT
6162
6263
check_source:
6364
name: "Run code checks"
@@ -73,6 +74,9 @@ jobs:
7374
with:
7475
ref: ${{ needs.prinfo.outputs.commit_ref }}
7576
docker: ${{ needs.prinfo.outputs.build_docker == 'true' }}
76-
docker_repository: "ghcr.io/noku-team/assertoor"
77+
docker_repository: "ethpandaops/assertoor"
7778
docker_tag_prefix: ${{needs.prinfo.outputs.docker_tag}}
7879
additional_tags: "['${{needs.prinfo.outputs.docker_tag}}','${{needs.prinfo.outputs.docker_tag}}-latest']"
80+
secrets:
81+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
82+
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

0 commit comments

Comments
 (0)