Merge pull request #9 from gregoranders/development

0.0.2 Release
gregoranders · Jun 10, 2020 · 5240917 · 5240917
2 parents aff9314 + 4bb8f73
commit 5240917
Show file tree

Hide file tree

Showing 46 changed files with 400 additions and 345 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -41,48 +41,34 @@ jobs:
         env:
           CI: true
       - name: code coverage
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: ./coverage/lcov.info
         env:
           CI: true
-      - name: publish code coverage to code climate
-        if: matrix.os == 'ubuntu-latest'
-        uses: paambaati/codeclimate-action@v2.3.0
-        env:
-          CI: true
-          CC_TEST_REPORTER_ID: ${{ secrets.CODE_CLIMATE }}
-        with:
-          coverageCommand: npm run test
-          debug: true
-      - name: npm run it
-        if: matrix.os == 'ubuntu-latest'
+      - name: npm run e2e
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
         run: |
           sudo apt-get update
           sudo apt-get install xvfb
-          xvfb-run --auto-servernum -- bash -c "npm run it"
+          xvfb-run --auto-servernum -- bash -c "npm run e2e"
         env:
           GITHUB_BRANCH: ${{ github.ref }}
           GITHUB_COMMIT: ${{ github.sha }}
           PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
-      - name: npm run it
-        if: matrix.os == 'macos-latest'
+      - name: npm run e2e
+        if: matrix.os == 'macos-latest' && matrix.node-version == '14.x'
         run: |
-          npm run it
+          npm run e2e
         env:
           GITHUB_BRANCH: ${{ github.ref }}
           GITHUB_COMMIT: ${{ github.sha }}
           PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
       - name: archive e2e screenshots
         uses: actions/upload-artifact@v1
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
-        with:
-          name: Screenshots
-          path: it/screenshots
-      - name: archive e2e diff
-        uses: actions/upload-artifact@v1
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
+        if: ( matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' ) && matrix.node-version == '14.x'
         with:
-          name: Screenshots Diff
-          path: it/__image_snapshots__
+          name: Screenshots Development ${{ matrix.os }} ${{ matrix.node-version }}
+          path: e2e/screenshots
diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
@@ -40,19 +40,12 @@ jobs:
           npm test
         env:
           CI: true
-      - name: code coverage
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: ./coverage/lcov.info
-        env:
-          CI: true
-      - name: npm run it
-        if: matrix.os == 'ubuntu-latest'
+      - name: npm run e2e
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
         run: |
           sudo apt-get update
           sudo apt-get install xvfb
-          xvfb-run --auto-servernum -- bash -c "npm run it"
+          xvfb-run --auto-servernum -- bash -c "npm run e2e"
         env:
           GITHUB_BRANCH: ${{ github.ref }}
           GITHUB_COMMIT: ${{ github.sha }}
@@ -61,11 +54,5 @@ jobs:
         uses: actions/upload-artifact@v1
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
         with:
-          name: Screenshots
-          path: it/screenshots
-      - name: archive e2e diff
-        uses: actions/upload-artifact@v1
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
-        with:
-          name: Screenshots Diff
-          path: it/__image_snapshots__
+          name: Screenshots Feature ${{ matrix.os }} ${{ matrix.node-version }}
+          path: e2e/screenshots
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -42,80 +42,56 @@ jobs:
         env:
           CI: true
       - name: code coverage
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: ./coverage/lcov.info
         env:
           CI: true
       - name: publish code coverage to code climate
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
         uses: paambaati/codeclimate-action@v2.3.0
         env:
           CI: true
           CC_TEST_REPORTER_ID: ${{ secrets.CODE_CLIMATE }}
         with:
           coverageCommand: npm run test
           debug: true
-      - name: npm run it
-        if: matrix.os == 'ubuntu-latest'
+      - name: npm run e2e
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
         run: |
           sudo apt-get update
           sudo apt-get install xvfb
-          xvfb-run --auto-servernum -- bash -c "npm run it"
+          xvfb-run --auto-servernum -- bash -c "npm run e2e"
         env:
           GITHUB_BRANCH: ${{ github.ref }}
           GITHUB_COMMIT: ${{ github.sha }}
           PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
-      - name: npm run it
-        if: matrix.os == 'macos-latest'
+      - name: npm run e2e
+        if: matrix.os == 'macos-latest' && matrix.node-version == '14.x'
         run: |
-          npm run it
+          npm run e2e
         env:
           GITHUB_BRANCH: ${{ github.ref }}
           GITHUB_COMMIT: ${{ github.sha }}
           PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
       - name: archive e2e screenshots
         uses: actions/upload-artifact@v1
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
-        with:
-          name: Screenshots
-          path: it/screenshots
-      - name: archive e2e diff
-        uses: actions/upload-artifact@v1
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
+        if: ( matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' ) && matrix.node-version == '14.x'
         with:
-          name: Screenshots Diff
-          path: it/__image_snapshots__
+          name: Screenshots Master ${{ matrix.os }} ${{ matrix.node-version }}
+          path: e2e/screenshots
       - name: create release
+        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
         id: createrelease
         uses: gregoranders/nodejs-create-release@v0.0.6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
         with:
           tag: v${{ steps.projectinfo.outputs.version }}
-          name: ${{ steps.projectinfo.outputs.name }} - ${{ steps.projectinfo.outputs.version }}
+          name: ${{ steps.projectinfo.outputs.version }} Release
           body: ${{ steps.projectinfo.outputs.name }} - ${{ steps.projectinfo.outputs.version }} Release
           target: ${{ github.ref }}
           draft: false
-      - name: update storybook docs
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
-        run: |
-          cd docs/public
-          git config --global user.email "${{ secrets.EMAIL }}"
-          git config --global user.name "Gregor Anders"
-          git status
-          git checkout master
-          cd ../..
-          npm run build-storybook
-          cd docs/public
-          git status
-          git add -f .
-          git commit -m "Updated storybook" .
-          git push
-        env:
-          NODE_ENV: production
-          GITHUB_BRANCH: ${{ github.ref }}
-          GITHUB_COMMIT: ${{ github.sha }}
-          PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,16 +3,16 @@ name: Release CI
 on:
   release:
     types:
-      - edited
+      - created
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        node-version: [10.x, 12.x, 13.x, 14.x]
+        os: [ubuntu-latest]
+        node-version: [14.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -40,71 +40,36 @@ jobs:
           npm test
         env:
           CI: true
-      - name: code coverage
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: ./coverage/lcov.info
-        env:
-          CI: true
-      - name: publish code coverage to code climate
-        if: matrix.os == 'ubuntu-latest'
-        uses: paambaati/codeclimate-action@v2.3.0
-        env:
-          CI: true
-          CC_TEST_REPORTER_ID: ${{ secrets.CODE_CLIMATE }}
-        with:
-          coverageCommand: npm run test
-          debug: true
-      - name: npm run it
-        if: matrix.os == 'ubuntu-latest'
+      - name: npm run e2e
         run: |
           sudo apt-get update
           sudo apt-get install xvfb
-          xvfb-run --auto-servernum -- bash -c "npm run it"
-        env:
-          GITHUB_BRANCH: ${{ github.ref }}
-          GITHUB_COMMIT: ${{ github.sha }}
-          PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
-      - name: npm run it
-        if: matrix.os == 'macos-latest'
-        run: |
-          npm run it
+          xvfb-run --auto-servernum -- bash -c "npm run e2e"
         env:
           GITHUB_BRANCH: ${{ github.ref }}
           GITHUB_COMMIT: ${{ github.sha }}
           PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
       - name: archive e2e screenshots
         uses: actions/upload-artifact@v1
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
-        with:
-          name: Screenshots
-          path: it/screenshots
-      - name: archive e2e diff
-        uses: actions/upload-artifact@v1
-        if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
         with:
-          name: Screenshots Diff
-          path: it/__image_snapshots__
-      - name: create release
-        id: createrelease
-        uses: gregoranders/nodejs-create-release@v0.0.6
+          name: Screenshots Release ${{ matrix.os }} ${{ matrix.node-version }}
+          path: e2e/screenshots
+      - name: update storybook docs
+        run: |
+          cd docs/public
+          git config --global user.email "${{ secrets.EMAIL }}"
+          git config --global user.name "Gregor Anders"
+          git status
+          git checkout master
+          cd ../..
+          npm run build-storybook
+          cd docs/public
+          git status
+          git add -f .
+          git commit -m "${{ steps.projectinfo.outputs.name }} - v${{ steps.projectinfo.outputs.version }}" .
+          git push
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_ENV: production
+          GITHUB_BRANCH: ${{ github.ref }}
+          GITHUB_COMMIT: ${{ github.sha }}
           PACKAGE_JSON: ${{ steps.projectinfo.outputs.context }}
-        with:
-          tag: v${{ steps.projectinfo.outputs.version }}
-          name: ${{ steps.projectinfo.outputs.name }} - ${{ steps.projectinfo.outputs.version }}
-          body: ${{ steps.projectinfo.outputs.name }} - ${{ steps.projectinfo.outputs.version }} Release
-          target: ${{ github.ref }}
-          draft: false
-      # - name: upload asset
-      #   if: matrix.os == 'ubuntu-latest' && matrix.node-version == '12.x'
-      #   id: uploadasset
-      #   uses: gregoranders/nodejs-upload-asset@v0.0.6
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     id: ${{ steps.createrelease.outputs.id }}
-      #     path: dist/index.js
-      #     name: index.js
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,7 @@
 dist/
 coverage/
-coverage-it/
-public-it/
+coverage-e2e/
 node_modules/
-storybook-static/
 
 package-lock.json
 junit.xml

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "docs/public"]
 	path = docs/public
 	url = git@github.com:gregoranders/ts-react-playground-docs.git
-[submodule "it/__image_snapshots__"]
-	path = it/__image_snapshots__
+[submodule "e2e/screenshots"]
+	path = e2e/screenshots
 	url = git@github.com:gregoranders/ts-react-playground-test-data.git