diff --git a/.github/actions/loki/test/entrypoint.sh b/.github/actions/loki/test/entrypoint.sh old mode 100644 new mode 100755 diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7ed805026..5e56bad0e 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -62,13 +62,32 @@ jobs: - run: yarn install if: steps.yarn-cache.outputs.cache-hit != 'true' - run: yarn run build - - run: yarn publish from-package --yes - if: github.ref == 'refs/heads/master' + - run: yarn publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} - - run: yarn publish --canary --preid dev --dist-tag next --yes - if: github.ref == 'refs/heads/develop' + - run: yarn release + + publish-to-gh-pages: + name: Publish to GitHub Pages + runs-on: ubuntu-latest + needs: + - build-and-test + environment: + name: github-pages + steps: + - uses: actions/checkout@v2 + with: + ref: gh-pages + - uses: actions/download-artifact@v2 + with: + name: storybooks + path: | + storybook-static + - uses: crazy-max/ghaction-github-pages@v2 + with: + target_branch: gh-pages + build_dir: "storybook-static" + commit_message: "Deploy to Github Pages [skip ci]" + jekyll: false env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} - - run: yarn release -y - - run: yarn deploy-storybook + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5888cd79b..db0124118 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,11 @@ jobs: - uses: actions/download-artifact@v2 with: name: "storybooks-${{ github.event.number }}" - path: packages + path: | + storybook-static - run: | cat package.json | sed s/\.docker/.app/ > package.json-new mv package.json-new package.json + - uses: ./.github/actions/loki/test + with: + working_dir: . diff --git a/CHANGELOG.md b/CHANGELOG.md index b3d10391e..7437be4ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## 1.9.2 - 2021-04-13 +bump version + +## 1.9.1 - 2021-04-12 +[CHORE] Circle CI to github actions #577 +[CHORE] Remove circle CI #580 + ## 1.9.0 - 2021-03-22 [FIX] Add sanitizer to prevent XSS attacks [FIX] Wrong Hebrew word הדועה to הודעה #556 diff --git a/package.json b/package.json index e0a07e499..c9b621ab4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.9.0", + "version": "1.9.2", "files": [ "/build" ],