Merge branch 'remove-jackson-asl' of https://github.com/jjoyce0510/da…

…tahub-1 into remove-jackson-asl
datahub-project · May 5, 2022 · 3e5106b · 3e5106b
2 parents 7f7b52d + 6d0dacd
commit 3e5106b
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 85 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -33,8 +33,8 @@ jobs:
         # running build first without datahub-web-react:yarnBuild and then with it is 100% stable
         # datahub-frontend:unzipAssets depends on datahub-web-react:yarnBuild but gradle does not know about it
         run: |
-          ./gradlew build -x :metadata-ingestion:build -x :metadata-ingestion:check -x docs-website:build -x datahub-web-react:yarnBuild -x datahub-frontend:unzipAssets
-          ./gradlew build -x :metadata-ingestion:build -x :metadata-ingestion:check -x docs-website:build -x :metadata-integration:java:spark-lineage:test
+          ./gradlew build -x :metadata-ingestion:build -x :metadata-ingestion:check -x docs-website:build -x datahub-web-react:yarnBuild -x datahub-frontend:unzipAssets -x :metadata-io:test -x :metadata-integration:java:datahub-protobuf:build
+          ./gradlew build -x :metadata-ingestion:build -x :metadata-ingestion:check -x docs-website:build -x :metadata-integration:java:spark-lineage:test -x :metadata-io:test -x :metadata-integration:java:datahub-protobuf:build
       - uses: actions/upload-artifact@v2
         if: always()
         with:
@@ -75,7 +75,7 @@ jobs:
       - name: Install dependencies
         run: ./metadata-ingestion/scripts/install_deps.sh
       - name: Gradle build
-        run: ./gradlew build -x check -x docs-website:build
+        run: ./gradlew build -x check -x docs-website:build -x test -x yarnTest -x lint -x yarnLint -x testQuick -x :metadata-integration:java:spark-lineage:test
       - name: Smoke test
         run: ./smoke-test/smoke.sh
         env:

diff --git a/.github/workflows/metadata-io.yml b/.github/workflows/metadata-io.yml
@@ -0,0 +1,63 @@
+name: metadata-io
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - "docs/**"
+      - "**.md"
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - "docs/**"
+      - "**.md"
+  release:
+    types: [published, edited]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.6"
+      - name: Gradle build (and test)
+        # there is some race condition in gradle build, which makes gradle never terminate in ~30% of the runs
+        # running build first without datahub-web-react:yarnBuild and then with it is 100% stable
+        # datahub-frontend:unzipAssets depends on datahub-web-react:yarnBuild but gradle does not know about it
+        run: |
+          ./gradlew :metadata-io:test
+      - uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: Test Results (metadata-io)
+          path: |
+            **/build/reports/tests/test/**
+            **/build/test-results/test/**
+            **/junit.*.xml
+      - name: Ensure codegen is updated
+        run: |
+          if output=$(git status --porcelain) && [ ! -z "$output" ]; then
+            # See https://unix.stackexchange.com/a/155077/378179.
+            echo 'There are uncommitted changes:'
+            echo $output
+            exit 1
+          else
+            echo 'All good!'
+          fi
+
+  event-file:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Upload
+        uses: actions/upload-artifact@v2
+        with:
+          name: Event File
+          path: ${{ github.event_path }}
diff --git a/...raphql-service/src/main/java/com/linkedin/datahub/graphql/context/SpringQueryContext.java b/...raphql-service/src/main/java/com/linkedin/datahub/graphql/context/SpringQueryContext.java
diff --git a/...raphql-service/src/main/java/com/linkedin/datahub/graphql/service/AllowAllAuthorizer.java b/...raphql-service/src/main/java/com/linkedin/datahub/graphql/service/AllowAllAuthorizer.java
diff --git a/...ql-service/src/main/java/com/linkedin/datahub/graphql/service/QueryGraphQLInvocation.java b/...ql-service/src/main/java/com/linkedin/datahub/graphql/service/QueryGraphQLInvocation.java
diff --git a/gradle.properties b/gradle.properties
@@ -3,8 +3,8 @@ org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.caching=false
 
-# Increase gradle JVM memory to 2GB to allow tests to run locally
-#org.gradle.jvmargs=-Xmx2000m
+# Increase gradle JVM memory to 3GB to help CI pass
+org.gradle.jvmargs=-Xmx3000m
 
 # Increase retries to 5 (from default of 3) and increase interval from 125ms to 1s.
 org.gradle.internal.repository.max.retries=5