actions cleanup

This commit is contained in:
Jonathan Shook 2023-01-23 17:57:32 -06:00
parent 6a118d289a
commit ac7f5762c0
2 changed files with 46 additions and 71 deletions

View File

@ -23,27 +23,6 @@ jobs:
java-package: jdk
architecture: x64
# - name: avoid release loop
# run: scripts/avoid-release-loop.sh
# env:
# GIT_RELEASE_BOT_NAME: "nb-droid"
#
# - name: capture tty for gpg
# run: |
# echo "TTY="$(tty) >> $GITHUB_ENV
# echo "GPG_TTY="$(tty) >> $GITHUB_ENV
# # echo "::set-env name=TTY::"$(tty)
# # echo "::set-env name=GPG_TTY::"$(tty)
#
# - name: initialize gpg
# run: |
# set -x
# echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key
# gpg --import --batch ./private.key
# rm ./private.key
# echo "gnupg files:"
# ls -l ~/.gnupg/
#
- name: set git username
run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
@ -61,6 +40,7 @@ jobs:
- name: Cache Maven packages
uses: actions/cache@v2
with:
node-version: '16'
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
@ -74,24 +54,24 @@ jobs:
- name: build prerelease revision
run: |
mvn package -Drevision="${{ env.PRERELEASE_REVISION }}"
- name: generate javadoc
run: mvn javadoc:aggregate-jar
continue-on-error: false
mvn clean package -Drevision="${{ env.PRERELEASE_REVISION }}"
- name: Setup docker buildx
uses: docker/setup-buildx-action@v1
with:
node-version: '16'
- name: docker hub login
uses: docker/login-action@v1
with:
node-version: '16'
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: docker test build
uses: docker/build-push-action@v2
with:
node-version: '16'
context: .
file: Dockerfile
pull: true
@ -103,19 +83,6 @@ jobs:
run: |
docker run --rm nosqlbench/nosqlbench:${{ env.PRERELEASE_REVISION }} --version
# - name: bundle integration test logs
# run: |
# pwd
# find nb
# mkdir -p itlogs/nb
# cp -R nb/logs itlogs/nb
#
# - name: upload integration test logs
# uses: actions/upload-artifact@v1
# with:
# name: itlogs
# path: itlogs
- name: bundle artifacts
run: |
pwd
@ -131,11 +98,16 @@ jobs:
- run: ls -la target
- name: upload javadoc
uses: actions/upload-artifact@v3
with:
name: javadoc
path: target/nosqlbench-*-javadoc.jar
# - name: generate javadoc
# run: mvn javadoc:aggregate-jar
# continue-on-error: false
#
# - name: upload javadoc
# uses: actions/upload-artifact@v3
# with:
# name: javadoc
# path: target/nosqlbench-*-javadoc.jar
- name: prepare release summary
id: prepare_summary
@ -145,7 +117,7 @@ jobs:
summary="${summary//'%'/'%25'}"
summary="${summary//$'\n'/'%0A'}"
summary="${summary//$'\r'/'%0D'}"
echo "::set-output name=release_summary::$summary"
echo "release_summary=$summary" >> $GITHUB_STATE
- name: tag prerelease
run: |
@ -168,6 +140,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
node-version: '16'
tag_name: ${{ env.PRERELEASE_REVISION }}
release_name: Release ${{ env.PRERELEASE_REVISION }}
draft: false
@ -180,6 +153,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
node-version: '16'
upload_url: ${{ steps.create_github_release.outputs.upload_url }}
asset_path: nb5/target/nb5.jar
asset_name: nb5.jar
@ -204,30 +178,30 @@ jobs:
path: |
[a-zA-Z]**/logs/*
javadocs:
needs: release
runs-on: ubuntu-20.04
steps:
- name: set git username
run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
- name: set git email
run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
- name: download javadocs
uses: actions/download-artifact@v3
with:
name: javadoc
- run: ls -la
- name: unpackage javadoc
run: unzip nosqlbench-*-javadoc.jar
- run: ls -la
- name: Push javadocs
uses: ad-m/github-push-action@master
with:
repository: nosqlbench/nosqlbench-javadoc
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: main
# javadocs:
# needs: release
# runs-on: ubuntu-20.04
# steps:
# - name: set git username
# run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
# - name: set git email
# run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
# - name: download javadocs
# uses: actions/download-artifact@v3
# with:
# name: javadoc
# - run: ls -la
# - name: unpackage javadoc
# run: unzip nosqlbench-*-javadoc.jar
# - run: ls -la
# - name: Push javadocs
# uses: ad-m/github-push-action@master
# with:
# repository: nosqlbench/nosqlbench-javadoc
# github_token: ${{ secrets.GITHUB_TOKEN }}
# branch: main
#
#
# docs:
# needs: release
# runs-on: ubuntu-20.04

View File

@ -1,5 +1,6 @@
- adb40cec4 (HEAD -> prerelease-testing) version fixes
- 1adb4e4af (origin/prerelease-testing) fix version, again
- 6a118d289 (HEAD -> prerelease-testing, origin/prerelease-testing) naming fixes
- adb40cec4 version fixes
- 1adb4e4af fix version, again
- 801ed23ce fix revision var
- 430bee3eb fix version reference
- 1f5b133f9 version fixes