Fix the .ci.sh and GitHub Action

nirui · Jul 29, 2020 · 21fd0de · 21fd0de
1 parent a73a520
commit 21fd0de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.ci.sh b/.ci.sh
@@ -13,7 +13,7 @@ SSHWIFTY_VERSION=$(git describe --always --dirty='*' --tag)
 SSHWIFTY_COMMIT=$(git describe --always)
 SSHWIFTY_RELEASE=$([ "$(echo $SSHWIFTY_VERSION | grep -oP ^[0-9]+\.[0-9]+\.[0-9]+\-[a-zA-Z0-9]+\-release$)" = '' ] || echo 'yes')
 SSHWIFTY_DEPLOY=$([ "$SSHWIFTY_RELEASE" != 'yes' ] || echo 'yes')
-SSHWIFTY_DOCKER_IMAGE_TAG="$DOCKER_HUB_USER/github_action_test"
+SSHWIFTY_DOCKER_IMAGE_TAG="$DOCKER_HUB_USER/sshwifty"
 SSHWIFTY_DOCKER_IMAGE_PUSH_TAG="$SSHWIFTY_DOCKER_IMAGE_TAG:$SSHWIFTY_VERSION"
 SSHWIFTY_DOCKER_IMAGE_PUSH_TAG_LATEST="$SSHWIFTY_DOCKER_IMAGE_TAG:latest"
 
@@ -86,6 +86,8 @@ fi
 echo "Version: $SSHWIFTY_VERSION"
 echo "Files: $(pwd)" && ls -la
 export
+git status --short
+git log --pretty=oneline --since="last tag"
 
 catch retry npm install
 
@@ -110,7 +112,7 @@ if [ "$SSHWIFTY_DEPLOY" = 'yes' ]; then
         echo "# Version $SSHWIFTY_VERSION" > ./.tmp/release/Note &&
         echo >> ./.tmp/release/Note &&
         echo "Updates introduced since $(git describe --abbrev=0 --tags $(git rev-list --tags --skip=1 --max-count=1))" >> ./.tmp/release/Note &&
-        git log $(git describe --abbrev=0 --tags $(git rev-list --tags --skip=1 --max-count=1))..HEAD --pretty=format:"- %h %s - (%an) %GK %G?" >> ./.tmp/release/Note &&
+        git log --since="last tag" --pretty=format:"- %h %s - (%an) %GK %G?" >> ./.tmp/release/Note &&
         echo '"'"'#!/bin/sh'"'"' > ./.tmp/generated/prepare.sh &&
         echo '"'"'echo Preparing for $1 ... && \'"'"' >> ./.tmp/generated/prepare.sh &&
         echo '"'"'(cd $1/ && find . -maxdepth 1 -type f ! -name "SUM.*" -exec sha512sum {} \; > SUM.sha512) && \'"'"' >> ./.tmp/generated/prepare.sh &&
@@ -127,4 +129,4 @@ if [ "$SSHWIFTY_DEPLOY" = 'yes' ]; then
         cat ./.tmp/release/SUM.sha512 &&
         ghr -t "$GITHUB_USER_TOKEN" -u "$GITHUB_USER" -n "$SSHWIFTY_VERSION-prebuild" -b "$(cat ./.tmp/release/Note)" -delete -prerelease "$SSHWIFTY_VERSION-prebuild" ./.tmp/release
         '
-fi
+fi
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -33,4 +33,4 @@ jobs:
           sudo apt-get install -qq -y qemu qemu-user-static binfmt-support
           sudo systemctl restart docker
 
-          chmod +x ./.ci.sh && ./.ci.sh
+          cp ./.ci.sh ./.github-action-ci-script.sh && chmod +x ./.github-action-ci-script.sh && ./.github-action-ci-script.sh && rm ./.github-action-ci-script.sh