Merge pull request #3 from TangibleInc/feature/local-site-with-wp-now

Update GitHub and Bitbucket build pipeline

.github/workflows/release.yml

@@ -1,29 +1,41 @@
-name: Deploy
-
-on:
-  push:
-    tags:
-      - "*.*.*"
-
+name: Release
 permissions:
-  contents: read
-  pages: write
-  id-token: write
-
+  contents: write
+on: push
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
-          node-version: 20
-      - name: Install
-        run: npm install
-      - name: Archive
-        run: npm run archive
-      - name: Release
+          fetch-depth: 0
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+      - name: Install dependencies
+        run: bun install
+      - name: Create archive
+        run: bunx roll archive -y
+      - name: Install pipeline
+        run: mkdir -p publish && cd publish && git clone https://github.com/tangibleinc/pipeline
+      - name: Add latest tag as needed
+        uses: EndBug/latest-tag@latest
+        if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
+      - name: Before release script
+        run: bun run publish/pipeline/before-release.ts
+      - name: Release tag
         uses: softprops/action-gh-release@v2
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
         with:
-          files: publish/tangible-fields.zip
+          body_path: publish/release.md
+          files: publish/*.zip
+      - name: Release preview at latest commit
+        uses: softprops/action-gh-release@v2
+        if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
+        with:
+          body_path: publish/release.md
+          files: publish/*.zip
+          tag_name: latest
+          make_latest: true
+      - name: After release script
+        run: bun run publish/pipeline/after-release.ts

bitbucket-pipelines.yml

@@ -1,14 +1,14 @@
-# This uses a consolidated script from https://bitbucket.org/tangibleinc/tangible-pipeline-v2
-image: php:7.4-fpm
+# See https://github.com/tangibleinc/pipeline
+image: php:8.1-fpm
 pipelines:
   # On every commit
   default:
     - step:
         script:
-          - curl --silent --location "https://${BB_AUTH_STRING}@api.bitbucket.org/2.0/repositories/tangibleinc/tangible-pipeline-v2/downloads/run" | bash
+          - curl -sL "https://${BB_AUTH_STRING}@api.bitbucket.org/2.0/repositories/tangibleinc/tangible-pipeline-v3/downloads/run" | bash
   # On every version tag
   tags:
     "*":
       - step:
           script:
-            - curl --silent --location "https://${BB_AUTH_STRING}@api.bitbucket.org/2.0/repositories/tangibleinc/tangible-pipeline-v2/downloads/run" | bash
+            - curl -sL "https://${BB_AUTH_STRING}@api.bitbucket.org/2.0/repositories/tangibleinc/tangible-pipeline-v3/downloads/run" | bash

composer.json

@@ -4,14 +4,19 @@
     {
       "type": "vcs",
       "url": "[email protected]:tangibleinc/framework.git"
+    },
+    {
+      "type": "vcs",
+      "url": "[email protected]:tangibleinc/updater.git"
     }
   ],
   "require-dev": {
     "phpunit/phpunit": "^9",
     "yoast/phpunit-polyfills": "^1.0"
   },
   "require": {
-    "tangible/framework": "dev-main"
+    "tangible/framework": "dev-main",
+    "tangible/updater": "dev-main"
   },
   "config": {
     "allow-plugins": {

index.php

@@ -13,7 +13,7 @@ function tangible_fields( $arg = false ) {
 
   public $name = 'tangible_fields';
   // Remember to update the version - Expected format: YYYYMMDD
-  public $version = '20240927';
+  public $version = '20241024';
 
   // Dynamic methods
   function __call( $method = '', $args = [] ) {
@@ -26,13 +26,8 @@ function __call( $method = '', $args = [] ) {
 
   function load() {
 
-    if (!class_exists('tangible\\framework')) {
-      $module_path = defined('TANGIBLE_FIELDS_IS_PLUGIN')
-        ? __DIR__ . '/vendor/tangible/'
-        : __DIR__ . '/../'; 
-
-      require_once $module_path . 'framework/index.php';
-    }
+    // Parent plugin is expected to load framework
+    if (!class_exists('tangible\\framework')) return;
 
     $fields = $this;
     tangible_fields( $fields );