Skip to content

Commit dbd57c9

Browse files
fix(ci): fix datahub-ingestion release/tag publishing (#12466)
1 parent 15c3783 commit dbd57c9

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.github/workflows/docker-unified.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
tag: ${{ steps.tag.outputs.tag }}
4545
slim_tag: ${{ steps.tag.outputs.slim_tag }}
4646
full_tag: ${{ steps.tag.outputs.full_tag }}
47+
short_sha: ${{ steps.tag.outputs.short_sha }} # needed for auto-deploy
4748
unique_tag: ${{ steps.tag.outputs.unique_tag }}
4849
unique_slim_tag: ${{ steps.tag.outputs.unique_slim_tag }}
4950
unique_full_tag: ${{ steps.tag.outputs.unique_full_tag }}
@@ -65,6 +66,8 @@ jobs:
6566
postgres_setup_change: ${{ steps.ci-optimize.outputs.postgres-setup-change == 'true' }}
6667
elasticsearch_setup_change: ${{ steps.ci-optimize.outputs.elasticsearch-setup-change == 'true' }}
6768
smoke_test_change: ${{ steps.ci-optimize.outputs.smoke-test-change == 'true' }}
69+
integrations_service_change: "false"
70+
datahub_executor_change: "false"
6871
steps:
6972
- name: Check out the repo
7073
uses: acryldata/sane-checkout-action@v3
@@ -864,7 +867,8 @@ jobs:
864867
context: .
865868
file: ./docker/datahub-ingestion/Dockerfile
866869
platforms: linux/amd64,linux/arm64/v8
867-
depot-project: ${{ vars.DEPOT_PROJECT_ID }}
870+
# Workaround 2025-01-25 - Depot publishing errors
871+
depot-project: ${{ (startsWith(github.ref, 'refs/tags/') || github.event_name == 'release') && '' || vars.DEPOT_PROJECT_ID }}
868872
- name: Compute Tag
869873
id: tag
870874
run: echo "tag=${{ needs.setup.outputs.ingestion_change == 'true' && needs.setup.outputs.unique_slim_tag || 'head-slim' }}" >> "$GITHUB_OUTPUT"
@@ -963,7 +967,8 @@ jobs:
963967
context: .
964968
file: ./docker/datahub-ingestion/Dockerfile
965969
platforms: linux/amd64,linux/arm64/v8
966-
depot-project: ${{ vars.DEPOT_PROJECT_ID }}
970+
# Workaround 2025-01-25 - Depot publishing errors
971+
depot-project: ${{ (startsWith(github.ref, 'refs/tags/') || github.event_name == 'release') && '' || vars.DEPOT_PROJECT_ID }}
967972
- name: Compute Tag (Full)
968973
id: tag
969974
run: echo "tag=${{ needs.setup.outputs.ingestion_change == 'true' && needs.setup.outputs.unique_tag || 'head' }}" >> "$GITHUB_OUTPUT"
@@ -1178,11 +1183,6 @@ jobs:
11781183
docker pull '${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:head'
11791184
docker tag '${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:head' '${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}'
11801185
fi
1181-
if [ '${{ needs.setup.outputs.integrations_service_change }}' == 'false' ]; then
1182-
echo 'datahub-integration-service head images'
1183-
docker pull '${{ env.DATAHUB_INTEGRATIONS_IMAGE }}:head'
1184-
docker tag '${{ env.DATAHUB_INTEGRATIONS_IMAGE }}:head' '${{ env.DATAHUB_INTEGRATIONS_IMAGE }}:${{ needs.setup.outputs.unique_tag }}'
1185-
fi
11861186
- name: CI Slim Head Images
11871187
run: |
11881188
if [ '${{ needs.setup.outputs.ingestion_change }}' == 'false' ]; then

docker/datahub-ingestion-base/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ext {
1212
docker_target = project.getProperties().getOrDefault("dockerTarget", "slim")
1313
docker_version = "${version}${docker_target == 'slim' ? '-slim' : ''}"
1414

15-
revision = 8 // increment to trigger rebuild
15+
revision = 10 // increment to trigger rebuild
1616
}
1717

1818
docker {

docker/datahub-ingestion/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ext {
1212
docker_target = project.getProperties().getOrDefault("dockerTarget", "slim")
1313
docker_version = "${version}${docker_target == 'slim' ? '-slim' : ''}"
1414

15-
revision = 9 // increment to trigger rebuild
15+
revision = 10 // increment to trigger rebuild
1616
}
1717

1818
dependencies {

0 commit comments

Comments
 (0)