fix broken autoformat

This commit is contained in:
Jonathan Shook 2020-12-07 14:34:01 -06:00
parent d00a50f1aa
commit 2b17cdccfc

View File

@ -10,282 +10,282 @@ jobs:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
steps: steps:
- name: checkout repo - name: checkout repo
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: setup java - name: setup java
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: '14' java-version: '14'
java-package: jdk java-package: jdk
architecture: x64 architecture: x64
- name: avoid release loop - name: avoid release loop
run: scripts/avoid-release-loop.sh run: scripts/avoid-release-loop.sh
env: env:
GIT_RELEASE_BOT_NAME: "nb-droid" GIT_RELEASE_BOT_NAME: "nb-droid"
- name: capture tty for gpg - name: capture tty for gpg
run: | run: |
echo "TTY="$(tty) >> $GITHUB_ENV echo "TTY="$(tty) >> $GITHUB_ENV
echo "GPG_TTY="$(tty) >> $GITHUB_ENV echo "GPG_TTY="$(tty) >> $GITHUB_ENV
# echo "::set-env name=TTY::"$(tty) # echo "::set-env name=TTY::"$(tty)
# echo "::set-env name=GPG_TTY::"$(tty) # echo "::set-env name=GPG_TTY::"$(tty)
- name: initialize gpg - name: initialize gpg
run: | run: |
set -x set -x
echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key
gpg --import --batch ./private.key gpg --import --batch ./private.key
rm ./private.key rm ./private.key
echo "gnupg files:" echo "gnupg files:"
ls -l ~/.gnupg/ ls -l ~/.gnupg/
- name: set git username - name: set git username
run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}" run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
- name: set git email - name: set git email
run: git config --global user.name "${{ secrets.NBDROID_NAME }}" run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
- name: free disk space - name: free disk space
run: | run: |
sudo swapoff -a sudo swapoff -a
sudo rm -f /swapfile sudo rm -f /swapfile
sudo apt clean sudo apt clean
docker rmi $(docker image ls -aq) docker rmi $(docker image ls -aq)
df -h df -h
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v1 uses: actions/cache@v1
with: with:
path: ~/.m2 path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2 restore-keys: ${{ runner.os }}-m2
- name: read versions - name: read versions
run: | run: |
set -x set -x
CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
RELEASE_VERSION=${CURRENT_VERSION%%-SNAPSHOT} RELEASE_VERSION=${CURRENT_VERSION%%-SNAPSHOT}
BASE_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f1-2) BASE_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f1-2)
MINOR_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f3) MINOR_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f3)
NEXT_MINOR_VERSION=$(( MINOR_VERSION+1)) NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT" NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}" RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV
echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV
# echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}" # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
# echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}" # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
# echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}" # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
- name: prepare release summary - name: prepare release summary
id: prepare_summary id: prepare_summary
run: | run: |
#summary=$(scripts/release-notes.sh) #summary=$(scripts/release-notes.sh)
summary=$(cat RELEASENOTES.md) summary=$(cat RELEASENOTES.md)
summary="${summary//'%'/'%25'}" summary="${summary//'%'/'%25'}"
summary="${summary//$'\n'/'%0A'}" summary="${summary//$'\n'/'%0A'}"
summary="${summary//$'\r'/'%0D'}" summary="${summary//$'\r'/'%0D'}"
echo "::set-output name=release_summary::$summary" echo "::set-output name=release_summary::$summary"
- name: prepare release - name: prepare release
run: scripts/release-prepare.sh run: scripts/release-prepare.sh
env: env:
RELEASE_BRANCH_NAME: "main" RELEASE_BRANCH_NAME: "main"
PRERELEASE_BRANCH_PATTERN: "-rc" PRERELEASE_BRANCH_PATTERN: "-rc"
GIT_RELEASE_BOT_NAME: "nb-droid" GIT_RELEASE_BOT_NAME: "nb-droid"
GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }} GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }} ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
GPG_ENABLED: "true" GPG_ENABLED: "true"
GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }} GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }} GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }} GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }} MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }} MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }} MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
- name: bundle integration test logs - name: bundle integration test logs
run: | run: |
pwd pwd
find nb find nb
mkdir -p itlogs/nb mkdir -p itlogs/nb
cp -R nb/logs itlogs/nb cp -R nb/logs itlogs/nb
- name: upload integration test logs - name: upload integration test logs
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
with: with:
name: itlogs name: itlogs
path: itlogs path: itlogs
- name: perform release - name: perform release
run: scripts/release-perform.sh run: scripts/release-perform.sh
continue-on-error: true continue-on-error: true
env: env:
RELEASE_BRANCH_NAME: "main" RELEASE_BRANCH_NAME: "main"
GIT_RELEASE_BOT_NAME: "nb-droid" GIT_RELEASE_BOT_NAME: "nb-droid"
GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }} GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }} ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
GPG_ENABLED: "true" GPG_ENABLED: "true"
GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }} GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }} GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }} GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }} MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }} MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }} MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
- name: bundle artifacts - name: bundle artifacts
run: | run: |
pwd pwd
ls -l ls -l
mkdir staging mkdir staging
cp nb/target/nb.jar nb/target/nb staging cp nb/target/nb.jar nb/target/nb staging
- name: upload artifacts - name: upload artifacts
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
with: with:
name: binaries name: binaries
path: staging path: staging
- name: select release type from branch name - name: select release type from branch name
run: | run: |
current_branch=$(git rev-parse --abbrev-ref HEAD) current_branch=$(git rev-parse --abbrev-ref HEAD)
if [[ ${current_branch} == *"-rc"* ]] if [[ ${current_branch} == *"-rc"* ]]
then then
echo "PRERELEASE=true" >> $GITHUB_ENV echo "PRERELEASE=true" >> $GITHUB_ENV
echo "DOCKER_TAGS='nosqlbench/nosqlbench:"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV echo "DOCKER_TAGS='nosqlbench/nosqlbench:"${{ env.RELEASE_VERSION }}"'" >> $GITHUB_ENV
else else
echo "PRERELEASE=false" >> $GITHUB_ENV echo "PRERELEASE=false" >> $GITHUB_ENV
echo "DOCKER_TAGS='nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:"${{ env echo "DOCKER_TAGS='nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:"${{ env
.RELEASE_VERSION }}"'" >> $GITHUB_ENV .RELEASE_VERSION }}"'" >> $GITHUB_ENV
fi fi
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v1
- name: docker hub login - name: docker hub login
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: docker build - name: docker build
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .
file: Dockerfile file: Dockerfile
pull: true pull: true
push: false push: false
load: true load: true
tags: ${{ env.DOCKER_TAGS }} tags: ${{ env.DOCKER_TAGS }}
- name: sanity check docker image - name: sanity check docker image
run: | run: |
docker run --rm -i -t nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version docker run --rm -i -t nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version
- name: docker push - name: docker push
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .
file: Dockerfile file: Dockerfile
pull: true pull: true
push: true push: true
tags: ${{ env.DOCKER_TAGS }} tags: ${{ env.DOCKER_TAGS }}
- name: bundle guidebook - name: bundle guidebook
run: mkdir guidebook && cp -R nb/target/guidebook guidebook run: mkdir guidebook && cp -R nb/target/guidebook guidebook
- name: upload guidebook - name: upload guidebook
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
with: with:
name: guidebook name: guidebook
path: guidebook path: guidebook
- name: create release - name: create release
id: create_release id: create_release
uses: actions/create-release@v1 uses: actions/create-release@v1
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
tag_name: ${{ env.RELEASE_TAGNAME }} tag_name: ${{ env.RELEASE_TAGNAME }}
release_name: Release ${{ env.RELEASE_TAGNAME }} release_name: Release ${{ env.RELEASE_TAGNAME }}
draft: false draft: false
prerelease: ${{ env.PRERELEASE }} prerelease: ${{ env.PRERELEASE }}
body: ${{ steps.prepare_summary.outputs.release_summary }} body: ${{ steps.prepare_summary.outputs.release_summary }}
- name: upload nb.jar - name: upload nb.jar
id: upload-nb-jar id: upload-nb-jar
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ steps.create_release.outputs.upload_url }} upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: nb/target/nb.jar asset_path: nb/target/nb.jar
asset_name: nb.jar asset_name: nb.jar
asset_content_type: application/octet-stream asset_content_type: application/octet-stream
- name: upload nb binary - name: upload nb binary
id: upload-nb-binary id: upload-nb-binary
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ steps.create_release.outputs.upload_url }} upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: nb/target/nb asset_path: nb/target/nb
asset_name: nb asset_name: nb
asset_content_type: application/octet-stream asset_content_type: application/octet-stream
docs: docs:
needs: release needs: release
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
steps: steps:
- name: set git username - name: set git username
run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}" run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
- name: set git email - name: set git email
run: git config --global user.name "${{ secrets.NBDROID_NAME }}" run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
- name: download guidebook - name: download guidebook
uses: actions/download-artifact@v1 uses: actions/download-artifact@v1
with: with:
name: guidebook name: guidebook
path: guidebook path: guidebook
- run: ls -la - run: ls -la
- name: clone nosqlbench-docs - name: clone nosqlbench-docs
env: env:
NBDROID_NAME: ${{ secrets.NBDROID_NAME }} NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }} NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
run: | run: |
git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git nosqlbench-docs git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git nosqlbench-docs
cd nosqlbench-docs cd nosqlbench-docs
echo "files listing" echo "files listing"
find . find .
git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git
git remote -v git remote -v
- name: push changes - name: push changes
env: env:
NBDROID_NAME: ${{ secrets.NBDROID_NAME }} NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }} NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
run: | run: |
rsync -av --delete guidebook/guidebook/ nosqlbench-docs/docs/ rsync -av --delete guidebook/guidebook/ nosqlbench-docs/docs/
echo "docs.nosqlbench.io" > nosqlbench-docs/docs/CNAME echo "docs.nosqlbench.io" > nosqlbench-docs/docs/CNAME
cd nosqlbench-docs cd nosqlbench-docs
git add docs git add docs
git add -u git add -u
CHANGES=$(git status --porcelain 2>/dev/null| wc -l) CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
echo "found $CHANGES to push for doc updates" echo "found $CHANGES to push for doc updates"
if (( $CHANGES > 0 )) if (( $CHANGES > 0 ))
then then
git commit -m"docs update for $GITHUB_REF" git commit -m"docs update for $GITHUB_REF"
git push git push
fi fi