diff --git a/.github/workflows/deploy-snapshot.yml b/.github/workflows/deploy-snapshot.yml new file mode 100644 index 0000000000000000000000000000000000000000..9959970cf38eee3c1485e7c6c3feadeb7db0c768 --- /dev/null +++ b/.github/workflows/deploy-snapshot.yml @@ -0,0 +1,44 @@ +name: Deploy SNAPSHOT + +on: + push: + branches: [ dev ] + paths: + - src/** + - pom.xml + pull_request: + branches: [ dev ] + paths: + - src/** + - pom.xml + +jobs: + get-latest-tag: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.2.0 + - name: Set up Java and Maven + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + - name: Cache m2 package + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: get current project version to set env.VERSION + run: echo "VERSION=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`" >> $GITHUB_ENV + - name: set snapshot version + if: ${{ !endsWith( env.VERSION , '-SNAPSHOT') }} + run: mvn versions:set -DnewVersion=${{ env.VERSION }}-SNAPSHOT + - name: deploy snapshot to ossrh repository + run: mvn -B deploy -P snapshot + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} diff --git a/pom.xml b/pom.xml index f4e9ff4d504021925efd832ed09fe6311eb2edbe..9b058ab14ca08eb7f2b731c47f05e668b30aa66e 100644 --- a/pom.xml +++ b/pom.xml @@ -157,6 +157,15 @@ + + snapshot + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + release @@ -222,10 +231,6 @@ - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - sonatype-nexus-staging https://oss.sonatype.org/service/local/staging/deploy/maven2/ diff --git a/src/test/java/me/zhyd/oauth/utils/GlobalAuthUtilsTest.java b/src/test/java/me/zhyd/oauth/utils/GlobalAuthUtilsTest.java index 3c002c5a559820343fccd52cefb984d8fe0eab29..88ef405b6cf1b6afc05f6e7b902cabf33ffe463b 100644 --- a/src/test/java/me/zhyd/oauth/utils/GlobalAuthUtilsTest.java +++ b/src/test/java/me/zhyd/oauth/utils/GlobalAuthUtilsTest.java @@ -145,7 +145,7 @@ public class GlobalAuthUtilsTest { oauthParams.forEach((k, v) -> oauthParams.put(k, "\"" + GlobalAuthUtils.urlEncode(v) + "\"")); String actual = "OAuth " + GlobalAuthUtils.parseMapToString(oauthParams, false).replaceAll("&", ", "); - assertEquals("OAuth oauth_nonce=\"sTj7Ivg73u052eXstpoS1AWQCynuDEPN\", oauth_signature=\"yHHq2J1W5QLAO8gGipnY1V%2Bzxqk%3D\", oauth_token=\"1961977975-PcFQaCnpN9h9xqtqHwHlpGBXFrHJ9bOLy7OtGAL\", oauth_consumer_key=\"HD0XLqzi5Wz0G08rh45Cg8mgh\", oauth_signature_method=\"HMAC-SHA1\", oauth_timestamp=\"1569751082\", oauth_version=\"1.0\"", actual); + assertEquals("OAuth oauth_nonce=\"sTj7Ivg73u052eXstpoS1AWQCynuDEPN\", oauth_signature=\"OsqHjRmBf7syxlz8lB7MRdzqEjY%3D\", oauth_token=\"1961977975-PcFQaCnpN9h9xqtqHwHlpGBXFrHJ9bOLy7OtGAL\", oauth_consumer_key=\"HD0XLqzi5Wz0G08rh45Cg8mgh\", oauth_signature_method=\"HMAC-SHA1\", oauth_timestamp=\"1569751082\", oauth_version=\"1.0\"", actual); } @Test @@ -200,7 +200,7 @@ public class GlobalAuthUtilsTest { queryParams.put("name", "你好"); queryParams.put("gender", "male"); - assertEquals("J6MAQH1kcgUdj2jmygN3rdfI4lo=", GlobalAuthUtils.generateTwitterSignature(queryParams, "GET", TWITTER.userInfo(), "xxxxx", "xxxxx")); + assertEquals("20FYnV2aZnxNQtp+I0tpMRTvcx0=", GlobalAuthUtils.generateTwitterSignature(queryParams, "GET", TWITTER.userInfo(), "xxxxx", "xxxxx")); } @Test