From 656e35e16dcba60a7850f70f0b2595a26b7cd281 Mon Sep 17 00:00:00 2001 From: minimit Date: Mon, 5 Oct 2020 20:16:53 +0200 Subject: [PATCH] fix: release --- .github/workflows/deploy.yml | 49 --------------------- .github/workflows/lint.yml | 38 ---------------- .github/workflows/{release.yml => main.yml} | 27 ++---------- README.md | 2 +- 4 files changed, 4 insertions(+), 112 deletions(-) delete mode 100644 .github/workflows/deploy.yml delete mode 100644 .github/workflows/lint.yml rename .github/workflows/{release.yml => main.yml} (52%) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 581e63960cf..00000000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Deploy - -on: - push: - branches: - - master - -env: - NODE: 12.x - -jobs: - deploy: - if: "!contains(github.event.commits[0].message, '[skip ci]')" - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - persist-credentials: false - - name: Node - uses: actions/setup-node@v1 - with: - node-version: "${{ env.NODE }}" - - name: Cache - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v2 - id: yarn-cache - with: - path: | - ${{ steps.yarn-cache-dir-path.outputs.dir }} - **/node_modules - ~/.npm - key: ${{ runner.os }}-node-v${{ env.NODE }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-node-v${{ env.NODE }}-yarn- - - name: Install - if: steps.yarn-cache.outputs.cache-hit != 'true' - run: yarn install --frozen-lockfile - - name: Build - run: yarn build - - name: Deploy - uses: JamesIves/github-pages-deploy-action@releases/v3 - with: - ACCESS_TOKEN: ${{ secrets.github_pages_github_token }} - BRANCH: gh-pages - FOLDER: public - GIT_CONFIG_NAME: minimit - GIT_CONFIG_EMAIL: beaver82@gmail.com diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index d2c97cfe219..00000000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Lint - -on: [push, pull_request] - -env: - NODE: 12.x - -jobs: - lint: - if: "!contains(github.event.commits[0].message, '[skip ci]')" - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - persist-credentials: false - - name: Node - uses: actions/setup-node@v1 - with: - node-version: "${{ env.NODE }}" - - name: Cache - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v2 - id: yarn-cache - with: - path: | - ${{ steps.yarn-cache-dir-path.outputs.dir }} - **/node_modules - ~/.npm - key: ${{ runner.os }}-node-v${{ env.NODE }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-node-v${{ env.NODE }}-yarn- - - name: Install - if: steps.yarn-cache.outputs.cache-hit != 'true' - run: yarn install --frozen-lockfile - - name: Lint - run: yarn lint diff --git a/.github/workflows/release.yml b/.github/workflows/main.yml similarity index 52% rename from .github/workflows/release.yml rename to .github/workflows/main.yml index 334a481171f..5f891d8f341 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/main.yml @@ -7,11 +7,8 @@ on: - release-0.14 - dev-0.15 -env: - NODE: 12.x - jobs: - release: + build: if: "!contains(github.event.commits[0].message, '[skip ci]')" runs-on: ubuntu-latest steps: @@ -19,27 +16,9 @@ jobs: uses: actions/checkout@v2 with: persist-credentials: false - - name: Node - uses: actions/setup-node@v1 - with: - node-version: "${{ env.NODE }}" - - name: Cache - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - uses: actions/cache@v2 - id: yarn-cache - with: - path: | - ${{ steps.yarn-cache-dir-path.outputs.dir }} - **/node_modules - ~/.npm - key: ${{ runner.os }}-node-v${{ env.NODE }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-node-v${{ env.NODE }}-yarn- - - name: Install - if: steps.yarn-cache.outputs.cache-hit != 'true' + - name: Yarn Install run: yarn install --frozen-lockfile - - name: Release + - name: Semantic Release uses: cycjimmy/semantic-release-action@v2 with: extra_plugins: | diff --git a/README.md b/README.md index da69664d65c..2eb8455b1ea 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# PORTED TO TAILWIND [xtend-ui](https://github.com/minimit/xtend-ui) +# PORTED TO TAILWIND [xtend-ui](https://www.npmjs.com/package/xtend-ui) ## Installation