diff --git a/.github/workflows/publish_branch.yml b/.github/workflows/publish_branch.yml new file mode 100644 index 000000000..b94a77b80 --- /dev/null +++ b/.github/workflows/publish_branch.yml @@ -0,0 +1,84 @@ +name: "publish-branch" + +on: + push: + +jobs: + npm-publish: + name: "Publish" + runs-on: ubuntu-latest + defaults: + run: + shell: bash + + steps: + ### Extract branch name + - name: Extract branch name + if: github.event_name != 'pull_request' + run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV + id: extract_branch + + - name: Extract branch name + if: github.event_name == 'pull_request' + run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV + + - name: Checkout repository + uses: actions/checkout@v2 + + ### Calculate FINAL_VERSION + - name: Install jq + run: sudo apt-get update && sudo apt-get --yes --force-yes install jq + + - name: Get version from npm and increment + run: | + set -x + yarn global add semver + PATH="$(yarn global bin):$PATH" + + # take npm version and increment it + PKG_NAME="$(cat package.json | jq -r .name)" + + # sanitize branch name so it can be used as a semver suffix (replace [^0-9a-zA-Z-] with hyphen) + SANITIZED_BRANCH="$(echo -n "${{ env.BRANCH_NAME }}" | tr -C '[:alnum:]-' -)" + + # take all versions from npm and replace single quotes with double quotes + NPM_VERSIONS=$(yarn info --silent "$PKG_NAME" versions 2>/dev/null | tr \' \") + # take only versions that contain branch name + NPM_VERSIONS_FILTERED=$(echo $NPM_VERSIONS | jq -r ".[] | select(contains(\"$SANITIZED_BRANCH\"))") + # flatten into a single line + NPM_VERSIONS_FLATTENED=$(echo $NPM_VERSIONS_FILTERED | awk '{print}' ORS=' ') + # sort versions according to semver, take highest (last) + LAST_NPM_VERSION="$(semver -p $(echo $NPM_VERSIONS_FLATTENED) | tail -n1 || true)" + # increment prerelease part of the version + PRERELEASE_NPM_VERSION="$(semver --increment prerelease --preid "$SANITIZED_BRANCH" "${LAST_NPM_VERSION}" || true)" # added '-0' here to avoid semver erroneously increment patch octet. Any suffix works, '-0' is chosen deliberately. + + # take local version + LOCAL_VERSION="$(cat package.json | jq -r .version)" + # set prerelease part on local version + LOCAL_PRERELEASE_VERSION="$(semver --increment prerelease --preid "$SANITIZED_BRANCH" "${LOCAL_VERSION}-0")" # added '-0' here to avoid semver erroneously increment patch octet. Any suffix works, '-0' is chosen deliberately. + + # take the highest version + MAX_VERSION="$(semver "$LOCAL_PRERELEASE_VERSION" "$PRERELEASE_NPM_VERSION" | tail -n1)" + + # save info to env + echo "FINAL_VERSION=$MAX_VERSION" | tee -a $GITHUB_ENV + echo "PKG_NAME=$PKG_NAME" | tee -a $GITHUB_ENV + + ### Set version + - name: Set version to ${{ env.FINAL_VERSION }} + run: yarn version --new-version ${{ env.FINAL_VERSION }} --no-git-tag-version + + ### Publish to NPM registry + - uses: actions/setup-node@v1 + with: + node-version: '15' + registry-url: 'https://registry.npmjs.org' + + - run: cat package.json + + - run: npm i + - run: npm run build + + - run: npm publish --access public + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml new file mode 100644 index 000000000..58add21dc --- /dev/null +++ b/.github/workflows/publish_release.yml @@ -0,0 +1,74 @@ +name: "publish-release" + +on: + push: + branches: + - "master" + +jobs: + npm-publish: + name: "Publish" + runs-on: ubuntu-latest + defaults: + run: + shell: bash + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + ### Calculate FINAL_VERSION + - name: Install jq + run: sudo apt-get update && sudo apt-get --yes --force-yes install jq + + - name: Get version from npm and increment + run: | + set -x + yarn global add semver + PATH="$(yarn global bin):$PATH" + + # take npm version and increment it + PKG_NAME="$(cat package.json | jq -r .name)" + NPM_VERSION="$(yarn info --silent "$PKG_NAME" version || true)" + NEXT_NPM_VERSION="$(semver --increment patch "$NPM_VERSION")" + + # take local version + LOCAL_VERSION="$(cat package.json | jq -r .version)" + + # take maximum of the local and NEXT_NPM versions + MAX_VERSION="$(semver "$LOCAL_VERSION" "$NEXT_NPM_VERSION" "0.0.0" | tail -n1)" + + # save info to env + echo "FINAL_VERSION=$MAX_VERSION" | tee -a $GITHUB_ENV + echo "PKG_NAME=$PKG_NAME" | tee -a $GITHUB_ENV" + + ### Set version + - name: Set version to ${{ env.FINAL_VERSION }} + run: yarn version --new-version ${{ env.FINAL_VERSION }} --no-git-tag-version + + ### Publish to NPM registry + - uses: actions/setup-node@v1 + with: + node-version: '14' + registry-url: 'https://registry.npmjs.org' + + - run: npm i + - run: npm run build + + - run: npm publish --access public + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + + ### Create a pre-release + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ env.FINAL_VERSION }} + release_name: Fluence Network ${{ env.FINAL_VERSION }} + body: | + [${{ env.FINAL_VERSION }} @ NPM registry](https://www.npmjs.com/package/${{ env.PKG_NAME }}/v/${{ env.FINAL_VERSION }}) + draft: false + prerelease: false \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 1ed349146..49d2050db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "fluence", - "version": "0.7.106", + "name": "@fluencelabs/fluence", + "version": "0.8.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c5ecec288..413ae32ba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "fluence", - "version": "0.7.108", - "description": "the browser js-libp2p client for the Fluence network", + "name": "@fluencelabs/fluence", + "version": "0.8.0", + "description": "JS SDK for the Fluence network", "main": "./dist/fluence.js", "typings": "./dist/fluence.d.ts", "scripts": {