Merge branch 'master' into release/T24.centaur

the-events-calendar · Aug 7, 2024 · f9891e7 · f9891e7
2 parents da8c1fc + abaf370
commit f9891e7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 27 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,19 +15,21 @@ jobs:
         with:
           fetch-depth: 1
           submodules: recursive
-      - name: Set node version
-        run: |
-          . ~/.nvm/nvm.sh && nvm install $(cat .nvmrc) && nvm use
-      - name: Get npm cache
-        uses: actions/cache@v2
-        id: npm-cache
+      # ------------------------------------------------------------------------------
+      # Setup Node.
+      # ------------------------------------------------------------------------------
+      - name: Check for .nvmrc file
+        id: check-nvmrc
+        run: echo "::set-output name=exists::$(test -f ${{ github.workspace }}/.nvmrc && echo 'true' || echo 'false')"
+
+      - uses: actions/setup-node@v3
+        if: steps.check-nvmrc.outputs.exists == 'true'
         with:
-          path: '~/.npm'
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: ${{ runner.os }}-npm-
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: package-lock.json
+
       - name: Install node modules
-        run: |
-          . ~/.nvm/nvm.sh && nvm use && npm ci
+        run: npm ci
       - name: Run linting tasks
-        run: |
-          . ~/.nvm/nvm.sh && nvm use && npm run lint
+        run: npm run lint
diff --git a/.github/workflows/tests-js.yml b/.github/workflows/tests-js.yml
@@ -12,21 +12,22 @@ jobs:
         with:
           fetch-depth: 1
           submodules: recursive
-      - name: Set node version
-        run: |
-          . ~/.nvm/nvm.sh && nvm install $(cat .nvmrc) && nvm use
-      - name: Get npm cache
-        uses: actions/cache@v2
-        id: npm-cache
+       # ------------------------------------------------------------------------------
+      # Setup Node.
+      # ------------------------------------------------------------------------------
+      - name: Check for .nvmrc file
+        id: check-nvmrc
+        run: echo "::set-output name=exists::$(test -f ${{ github.workspace }}/.nvmrc && echo 'true' || echo 'false')"
+
+      - uses: actions/setup-node@v3
+        if: steps.check-nvmrc.outputs.exists == 'true'
         with:
-          path: '~/.npm'
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: ${{ runner.os }}-npm-
+          node-version-file: '.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: package-lock.json
       - name: Install node modules
-        run: |
-          . ~/.nvm/nvm.sh && nvm use && npm ci
+        run: npm ci
       - name: Run jest task
-        run: |
-          . ~/.nvm/nvm.sh && nvm use && npm run jest
+        run: npm run jest
 
 
diff --git a/src/Tribe/Main.php b/src/Tribe/Main.php
@@ -30,7 +30,7 @@ class Tribe__Main {
 	 *
 	 * @var string
 	 */
-	protected $parent_plugin_file ='';
+	protected $parent_plugin_file = '';
 
 	public static $tribe_url = 'http://tri.be/';
 	public static $tec_url   = 'https://theeventscalendar.com/';