From 855716358f385e1c2a52773725bf643ac9eabd9b Mon Sep 17 00:00:00 2001 From: Lee Rhodes Date: Fri, 3 Jan 2025 10:08:36 -0800 Subject: [PATCH] push changes into 7.0.X --- .github/workflows/auto-check_cpp_files.yml | 45 ---------------------- .github/workflows/manual-javadoc.yml | 39 ------------------- pom.xml | 2 +- 3 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 .github/workflows/auto-check_cpp_files.yml delete mode 100644 .github/workflows/manual-javadoc.yml diff --git a/.github/workflows/auto-check_cpp_files.yml b/.github/workflows/auto-check_cpp_files.yml deleted file mode 100644 index f80403e53..000000000 --- a/.github/workflows/auto-check_cpp_files.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Auto C++ Serialization Compatibility Test - -on: - pull_request: - push: - branches: [ 7.0.X ] - workflow_dispatch: - -jobs: - build: - name: SerDe Test - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Checkout C++ - uses: actions/checkout@v4 - with: - repository: apache/datasketches-cpp - path: cpp - - - name: Setup Java - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - - name: Configure C++ build - run: cd cpp/build && cmake .. -DGENERATE=true - - - name: Build C++ unit tests - run: cd cpp && cmake --build build --config Release - - - name: Run C++ tests - run: cd cpp && cmake --build build --config Release --target test - - - name: Make dir - run: mkdir -p serialization_test_data/cpp_generated_files - - - name: Copy files - run: cp cpp/build/*/test/*_cpp.sk serialization_test_data/cpp_generated_files - - - name: Run Java tests - run: mvn test -P check-cpp-files diff --git a/.github/workflows/manual-javadoc.yml b/.github/workflows/manual-javadoc.yml deleted file mode 100644 index f1cd56e75..000000000 --- a/.github/workflows/manual-javadoc.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Publish JavaDoc - -on: - pull_request: - push: - branches: [ 7.0.X ] - workflow_dispatch: - -jobs: - javadoc: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup Java - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - - name: Echo Java Version - run: java -version - - - name: Print Current workflow - run: > - cat .github/workflows/manual-javadoc.yml - - - name: Generate JavaDoc - run: mvn clean javadoc:javadoc - - - name: Deploy JavaDoc - uses: JamesIves/github-pages-deploy-action@v4.6.8 - with: - token: ${{ secrets.GITHUB_TOKEN }} - folder: target/reports/apidocs - target-folder: docs/${{ github.ref_name }} - branch: gh-pages diff --git a/pom.xml b/pom.xml index c72af4f39..35022e3b1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ under the License. org.apache.datasketches datasketches-java - 7.1.0-SNAPSHOT + 7.0.0 jar ${project.artifactId}