Merge upstream

.github/workflows/pull_request_ci.yml

@@ -1,65 +1,65 @@
-name: thoth-core pull request ci
+# name: thoth-core pull request ci
 
-on: [pull_request]
+# on: [pull_request]
 
-jobs:
-  check-and-set-labels:
-    runs-on: ubuntu-latest
-    env:
-      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Fail thoth-core-draft
-        if: contains(github.event.pull_request.labels.*.name, 'thoth-core-draft')
-        run: exit 1
+# jobs:
+#   check-and-set-labels:
+#     runs-on: ubuntu-latest
+#     env:
+#       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+#       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#     steps:
+#       - name: Fail thoth-core-draft
+#         if: contains(github.event.pull_request.labels.*.name, 'thoth-core-draft')
+#         run: exit 1
 
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
+#       - uses: actions/checkout@v2
+#         with:
+#           fetch-depth: 0
 
-      - name: Check for git variance in the /core directory
-        run: git diff --quiet origin/main origin/${{ github.head_ref }} -- core
-        id: core_diff
-        shell: bash {0}
-        continue-on-error: true
+#       - name: Check for git variance in the /core directory
+#         run: git diff --quiet origin/main origin/${{ github.head_ref }} -- packages/core
+#         id: core_diff
+#         shell: bash {0}
+#         continue-on-error: true
 
-      - name: Check for an existing unique thoth-core label
-        if: steps.core_diff.outcome != 'success'
-        uses: docker://agilepathway/pull-request-label-checker:latest
-        id: no_thoth_core_label
-        with:
-          none_of: thoth-core
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-        continue-on-error: true
+#       - name: Check for an existing unique thoth-core label
+#         if: steps.core_diff.outcome != 'success'
+#         uses: docker://agilepathway/pull-request-label-checker:latest
+#         id: no_thoth_core_label
+#         with:
+#           none_of: thoth-core
+#           repo_token: ${{ secrets.GITHUB_TOKEN }}
+#         continue-on-error: true
 
-      - name: Label thoth-core-draft prs in queue for canary deployment
-        if: steps.core_diff.outcome != 'success' && steps.no_thoth_core_label.outcome != 'success' && !contains(github.event.pull_request.labels.*.name, 'thoth-core')
-        uses: actions-ecosystem/action-add-labels@v1
-        with:
-          labels: thoth-core-draft
-        continue-on-error: true
+#       - name: Label thoth-core-draft prs in queue for canary deployment
+#         if: steps.core_diff.outcome != 'success' && steps.no_thoth_core_label.outcome != 'success' && !contains(github.event.pull_request.labels.*.name, 'thoth-core')
+#         uses: actions-ecosystem/action-add-labels@v1
+#         with:
+#           labels: thoth-core-draft
+#         continue-on-error: true
 
-      - name: Fail thoth-core-draft
-        if: contains(github.event.pull_request.labels.*.name, 'thoth-core-draft')
-        run: exit 1
+#       - name: Fail thoth-core-draft
+#         if: contains(github.event.pull_request.labels.*.name, 'thoth-core-draft')
+#         run: exit 1
 
-      - name: Label unique thoth-core pr for canary deployment
-        if: steps.core_diff.outcome != 'success' && steps.no_thoth_core_label.outcome == 'success'
-        uses: actions-ecosystem/action-add-labels@v1
-        with:
-          labels: thoth-core
-        continue-on-error: true
+#       - name: Label unique thoth-core pr for canary deployment
+#         if: steps.core_diff.outcome != 'success' && steps.no_thoth_core_label.outcome == 'success'
+#         uses: actions-ecosystem/action-add-labels@v1
+#         with:
+#           labels: thoth-core
+#         continue-on-error: true
 
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        if: steps.core_diff.outcome != 'success' && (steps.no_thoth_core_label.outcome == 'success' || contains(github.event.pull_request.labels.*.name, 'thoth-core'))
-        with:
-          node-version: '16.14.0'
+#       - name: Setup Node
+#         uses: actions/setup-node@v2
+#         if: steps.core_diff.outcome != 'success' && (steps.no_thoth_core_label.outcome == 'success' || contains(github.event.pull_request.labels.*.name, 'thoth-core'))
+#         with:
+#           node-version: '16.14.0'
 
-      - name: Install Dependencies
-        run: yarn install
-        if: steps.core_diff.outcome != 'success' && (steps.no_thoth_core_label.outcome == 'success' || contains(github.event.pull_request.labels.*.name, 'thoth-core'))
+#       - name: Install Dependencies
+#         run: yarn install
+#         if: steps.core_diff.outcome != 'success' && (steps.no_thoth_core_label.outcome == 'success' || contains(github.event.pull_request.labels.*.name, 'thoth-core'))
 
-      - name: Publish next canary release of @latitudegames/thoth-core
-        run: git checkout yarn.lock && yarn publish:canary
-        if: steps.core_diff.outcome != 'success' && (steps.no_thoth_core_label.outcome == 'success' || contains(github.event.pull_request.labels.*.name, 'thoth-core'))
+#       - name: Publish next canary release of @latitudegames/thoth-core
+#         run: git checkout yarn.lock && yarn publish:canary
+#         if: steps.core_diff.outcome != 'success' && (steps.no_thoth_core_label.outcome == 'success' || contains(github.event.pull_request.labels.*.name, 'thoth-core'))

.github/workflows/thoth-core-release.yml

@@ -1,53 +1,53 @@
-name: thoth-core release conditions
-on:
-  pull_request:
-    types: [closed]
-jobs:
-  merge_job:
-    # this job will only run if a PR has been merged
-    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'thoth-core')
-    runs-on: ubuntu-latest
-    env:
-      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Check for thoth-core label and checkout main if present
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16.14.0'
-      - name: git setup
-        run: |
-          git config --global user.name 'Thoth CI'
-          git config --global user.email 'sean+thothci@latitude.io'
-      - name: set git tag name to enviroment
-        working-directory: core
-        run: echo "LATEST_TAG=v$(node -pe "require('./package.json').version")" >> $GITHUB_ENV
-      - name: add git tag and push
-        run: |
-          git tag ${{ env.LATEST_TAG }}
-          git push --tags
-      - name: Install Dependencies
-        run: yarn install
-      - name: Prepare and Release
-        working-directory: core
-        run: yarn release
-      - name: Publish to GitHub Packages
-        working-directory: core
-        run: npm publish
-      - name: Increment package for future prelease, commit and push
-        working-directory: core
-        run: |
-          cd ../client
-          yarn add @latitudegames/thoth-core
-          git add package.json
-          cd ..
-          git add yarn.lock
-          cd core
-          npm version patch 
-          git add package.json
-          git commit -m "Bump thoth-core to v$(node -pe "require('./package.json').version") and target latest release in thoth-client"
-          git push
+# name: thoth-core release conditions
+# on:
+#   pull_request:
+#     types: [closed]
+# jobs:
+#   merge_job:
+#     # this job will only run if a PR has been merged
+#     if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'thoth-core')
+#     runs-on: ubuntu-latest
+#     env:
+#       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+#       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#     steps:
+#       - name: Check for thoth-core label and checkout main if present
+#         uses: actions/checkout@v2
+#         with:
+#           fetch-depth: 0
+#       - name: Setup Node
+#         uses: actions/setup-node@v2
+#         with:
+#           node-version: '16.14.0'
+#       - name: git setup
+#         run: |
+#           git config --global user.name 'Thoth CI'
+#           git config --global user.email 'sean+thothci@latitude.io'
+#       - name: set git tag name to enviroment
+#         working-directory: packages/core
+#         run: echo "LATEST_TAG=v$(node -pe "require('./package.json').version")" >> $GITHUB_ENV
+#       - name: add git tag and push
+#         run: |
+#           git tag ${{ env.LATEST_TAG }}
+#           git push --tags
+#       - name: Install Dependencies
+#         run: yarn install
+#       - name: Prepare and Release
+#         working-directory: packages/core
+#         run: yarn release
+#       - name: Publish to GitHub Packages
+#         working-directory: packages/core
+#         run: npm publish
+#       - name: Increment package for future prelease, commit and push
+#         working-directory: packages/core
+#         run: |
+#           cd ../client
+#           yarn add @latitudegames/thoth-core
+#           git add package.json
+#           cd ..
+#           git add yarn.lock
+#           cd core
+#           npm version patch
+#           git add package.json
+#           git commit -m "Bump thoth-core to v$(node -pe "require('./package.json').version") and target latest release in thoth-client"
+#           git push

.vscode/launch.json

@@ -8,7 +8,7 @@
       "type": "pwa-chrome",
       "request": "launch",
       "name": "Launch Chrome against localhost",
-      "url": "http://localhost:3001",
+      "url": "http://localhost:3003",
       "sourceMap": true,
       "webRoot": "${workspaceFolder}/client",
       "trace": true,