Skip to content

Commit

Permalink
Merge branch 'master' into exclude-project-without-datasets-from-inge…
Browse files Browse the repository at this point in the history
…stion

# Conflicts:
#	metadata-ingestion/src/datahub/ingestion/source/bigquery_v2/bigquery.py
  • Loading branch information
upendrao committed Aug 21, 2023
2 parents 5d2794a + 022d1d0 commit 71e83c9
Show file tree
Hide file tree
Showing 419 changed files with 67,140 additions and 3,920 deletions.
13 changes: 11 additions & 2 deletions .github/actions/docker-custom-build-and-push/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ inputs:
# e.g. latest,head,sha12345
description: "List of tags to use for the Docker image"
required: true
target:
description: "Sets the target stage to build"
required: false
outputs:
image_tag:
description: "Docker image tags"
Expand All @@ -49,7 +52,7 @@ runs:
# add git short SHA as Docker tag
tag-custom: ${{ inputs.tags }}
tag-custom-only: true

# Code for testing the build when not pushing to Docker Hub.
- name: Build and Load image for testing (if not publishing)
uses: docker/build-push-action@v3
Expand All @@ -62,14 +65,17 @@ runs:
platforms: linux/amd64
build-args: ${{ inputs.build-args }}
tags: ${{ steps.docker_meta.outputs.tags }}
target: ${{ inputs.target }}
load: true
push: false
cache-from: type=registry,ref=${{ steps.docker_meta.outputs.tags }}
cache-to: type=inline
- name: Upload image locally for testing (if not publishing)
uses: ishworkh/docker-image-artifact-upload@v1
if: ${{ inputs.publish != 'true' }}
with:
image: ${{ steps.docker_meta.outputs.tags }}

# Code for building multi-platform images and pushing to Docker Hub.
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand All @@ -92,6 +98,9 @@ runs:
platforms: ${{ inputs.platforms }}
build-args: ${{ inputs.build-args }}
tags: ${{ steps.docker_meta.outputs.tags }}
target: ${{ inputs.target }}
push: true
cache-from: type=registry,ref=${{ steps.docker_meta.outputs.tags }}
cache-to: type=inline

# TODO add code for vuln scanning?
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
timezoneLinux: ${{ matrix.timezone }}
- uses: actions/checkout@v3
with:
fetch-depth: 0
fetch-depth: 800
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-datahub-jars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
fetch-depth: 800
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v3
with:
fetch-depth: 0
fetch-depth: 800
- uses: actions/setup-python@v4
with:
python-version: "3.10"
Expand Down
45 changes: 0 additions & 45 deletions .github/workflows/docker-ingestion-base.yml
Original file line number Diff line number Diff line change
@@ -1,45 +0,0 @@
name: ingestion base
on:
release:
types: [published]
push:
branches:
- master
paths:
- ".github/workflows/docker-ingestion-base.yml"
- "docker/datahub-ingestion-base/**"
- "gradle*"
pull_request:
branches:
- master
paths:
- ".github/workflows/docker-ingestion-base.yml"
- "docker/datahub-ingestion-base/**"
- "gradle*"
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build-base:
name: Build and Push Docker Image to Docker Hub
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Build and Push image
uses: ./.github/actions/docker-custom-build-and-push
with:
images: |
acryldata/datahub-ingestion-base
tags: latest
username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
publish: ${{ github.ref == 'refs/heads/master' }}
context: .
file: ./docker/datahub-ingestion-base/Dockerfile
platforms: linux/amd64,linux/arm64/v8
2 changes: 1 addition & 1 deletion .github/workflows/docker-ingestion-smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v3
with:
fetch-depth: 0
fetch-depth: 800
- name: Build and push
uses: ./.github/actions/docker-custom-build-and-push
with:
Expand Down
118 changes: 0 additions & 118 deletions .github/workflows/docker-ingestion.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/docker-postgres-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v3
with:
fetch-depth: 0
fetch-depth: 800
- name: Build and push
uses: ./.github/actions/docker-custom-build-and-push
with:
Expand Down
Loading

0 comments on commit 71e83c9

Please sign in to comment.