test

.github/workflows/repo.yml → .github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Publish
+name: Build, Publish
 
 on:
   pull_request:
@@ -80,7 +80,7 @@ jobs:
             ${{ runner.os }}-dist-
 
   #####################################################################
-  ## Test
+  ## Test (Trys to launch a chrome browser, will need additional work)
   #####################################################################
   # test:
   #   needs: setup
@@ -113,6 +113,15 @@ jobs:
       - name: Check out repository code ${{ github.repository }} on ${{ github.ref }}
         uses: actions/checkout@v3
 
+      - name: Configure Git user
+        run: |
+          git config --global user.email "pkgbot@form.io"
+          git config --global user.name "pkgbot"
+
+      - name: Add npm token to .npmrc
+        run: |
+          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
+
       - name: Set up Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
@@ -128,46 +137,36 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
 
+      - name: Build
+        uses: borales/actions-yarn@v4
+        with:
+          cmd: build
+
       - name: Prepare version for publish
         id: prep
         run: |
+          # Extract the pull request number and the short SHA of the commit
           PR_NUMBER=$(echo ${{ github.event.number }})
           COMMIT_SHORT_SHA=$(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-7)
+          
+          # Extract the current version from package.json
           CURRENT_VERSION=$(node -p "require('./package.json').version")
-          NEW_VERSION="${CURRENT_VERSION}-dev.${PR_NUMBER}.${COMMIT_SHORT_SHA}"
+          
+          # Get base SemVer to us for new dev version
+          BASE_VERSION=$(echo "$CURRENT_VERSION" | cut -d'-' -f1)
+          
+          # Construct the new version string
+          NEW_VERSION="${BASE_VERSION}-dev.${PR_NUMBER}.${COMMIT_SHORT_SHA}"
+          
+          # Output the new version for use in subsequent GitHub Actions steps
           echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
 
       - name: Echo version to Publish
         run: |
           echo "Version to publish: $NEW_VERSION"
 
-      - name: Echo version to Publish
-        run: |
-          echo "Version to publish: $NEW_VERSION"
-
-      # Restore Build cache
-      - name: Restore build cache
-        uses: actions/cache@v3
-        with:
-          path: dist
-          key: ${{ runner.os }}-dist-${{ hashFiles('dist.tgz') }}
-          restore-keys: |
-            ${{ runner.os }}-dist-
-
-      - name: Switch to build directory
-        run: cd ./dist/angular-formio
-
-      - name: Configure Git user
-        run: |
-          git config --global user.email "pkgbot@form.io"
-          git config --global user.name "pkgbot"
-
-      - name: Add npm token to .npmrc
-        run: |
-          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
-
-      - name: Publish to npm
-        run: |
-          npm version $NEW_VERSION
-          npm publish --tag=dev
+      # - name: Publish to npm
+      #   run: |
+      #     npm version $NEW_VERSION
+      #     npm publish --tag=dev