Merge pull request #34 from plugsy/beta

Author: Inlustra

.github/workflows/build-publish.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - beta
 
 jobs:
   getversion:
@@ -12,6 +13,8 @@ jobs:
     outputs:
       shouldBuild: ${{ steps.determineVersion.outputs.shouldBuild }}
       version: ${{ steps.determineVersion.outputs.version }}
+      coreLabels: ${{ steps.setLabels.outputs.core }}
+      agentLabels: ${{ steps.setLabels.outputs.agent }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -35,6 +38,20 @@ jobs:
           echo "::set-output name=version::$(cat .VERSION)"
           echo "Determined next version to be: $(cat .VERSION)"
 
+      
+      - name: Set Labels
+        id: setLabels
+        run: |
+          if [[ $REF == "refs/heads/main" ]]; then
+              echo "::set-output name=core::plugsy/core:${{ steps.determineVersion.outputs.version }},plugsy/core:latest"
+              echo "::set-output name=agent::plugsy/agent:${{ steps.determineVersion.outputs.version }},plugsy/agent:latest"
+          else
+              echo "::set-output name=core::plugsy/core:${{ steps.determineVersion.outputs.version }}"
+              echo "::set-output name=agent::plugsy/agent:${{ steps.determineVersion.outputs.version }}"
+          fi
+        env:
+          REF: ${{ github.ref }}
+
   buildcore:
     needs: getversion
     name: "Build Release Core"
@@ -75,10 +92,11 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
+          platforms: linux/amd64,linux/arm64
           context: .
           file: packages/core/Dockerfile
           push: true
-          tags: plugsy/core:${{ needs.getversion.outputs.version }},plugsy/core:latest
+          tags: ${{ needs.getversion.outputs.coreLabels }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
         # This ugly bit is necessary if you don't want your cache to grow forever
@@ -131,10 +149,11 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           context: .
           file: packages/agent/Dockerfile
           push: true
-          tags: plugsy/agent:${{ needs.getversion.outputs.version }},plugsy/agent:latest
+          tags: ${{ needs.getversion.outputs.agentLabels }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
         # This ugly bit is necessary if you don't want your cache to grow forever
@@ -179,6 +198,12 @@ jobs:
           find: "https:\\/\\/github\\.com\\/plugsy\\/core\\/releases\\/download\\/(.*?)\\/core-config-schema\\.json"
           replace: "https://github.com/plugsy/core/releases/download/v${{ needs.getversion.outputs.version }}/core-config-schema.json"
 
+      - name: Find and Replace
+        uses: jacobtomlinson/gha-find-replace@master
+        with:
+          find: "https:\\/\\/github\\.com\\/plugsy\\/core\\/releases\\/download\\/(.*?)\\/agent-config-schema\\.json"
+          replace: "https://github.com/plugsy/core/releases/download/v${{ needs.getversion.outputs.version }}/agent-config-schema.json"
+
       - name: Create Pull Request with updated package files
         uses: peter-evans/create-pull-request@v3
         with:

.gitignore

@@ -37,7 +37,6 @@ yarn-error.log*
 .cache
 dist
 
-**/.parcel-cache
 
 .yarn/*
 !.yarn/cache

.pnp.js

@@ -7,7 +7,6 @@
     "**/.yarn": true,
     "**/.pnp.*": true,
     "**/.cache/**": true,
-    "**/.parcel-cache/**": true,
   },
   "eslint.nodePath": ".yarn/sdks",
   "typescript.tsdk": ".yarn/sdks/typescript/lib",