This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-proxy.git
The following commit(s) were added to refs/heads/main by this push:
new 5ffd1b0 Update github settings
5ffd1b0 is described below
commit 5ffd1b0560435c319b2559a26592deeb1787ba31
Author: Christopher Tubbs <[email protected]>
AuthorDate: Tue Jan 17 23:16:29 2023 -0500
Update github settings
* Add .gitattributes to collapse generated code in code reviews by
default
* Update GitHub Actions to do a fast build without ITs and a longer one
with ITs
---
.gitattributes | 23 +++++++++++++++++++++++
.github/workflows/maven.yaml | 16 +++++++++-------
2 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..12bd2bd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,23 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+src/main/thrift-gen-java/** linguist-generated=true
+src/main/cpp/** linguist-generated=true
+src/main/python/accumulo/** linguist-generated=true
+src/main/ruby/accumulo/lib/** linguist-generated=true
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 6e3b654..6d48992 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -33,18 +33,20 @@ jobs:
strategy:
matrix:
profile:
- - {name: 'verify', args: 'verify javadoc:jar'}
+ - {name: 'unitTests', args: 'verify javadoc:jar -DskipITs'}
+ - {name: 'integrationTests', args: 'verify -Dspotbugs.skip
-Dcheckstyle.skip -Drat.skip'}
fail-fast: false
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Set up JDK 11
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
with:
+ distribution: adopt
java-version: 11
- name: Cache local maven repository
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: |
~/.m2/repository/
@@ -57,21 +59,21 @@ jobs:
MAVEN_OPTS: -Djansi.force=true
- name: Upload unit test results
if: ${{ failure() }}
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: surefire-reports-${{ matrix.profile.name }}
path: ./**/target/surefire-reports/
if-no-files-found: ignore
- name: Upload integration test results
if: ${{ failure() }}
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: failsafe-reports-${{ matrix.profile.name }}
path: ./**/target/failsafe-reports/
if-no-files-found: ignore
- name: Upload mini test logs
if: ${{ failure() }}
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: mini-tests-logs-${{ matrix.profile.name }}
path: ./**/target/**/mini-tests/**/logs/
