Skip to content

Commit 48c2260

Browse files
dkotterdkotter
committed
Merge branch 'develop'
2 parents 1e2b888 + b6f5c9d commit 48c2260

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+5401
-791
lines changed

‎.env.test.sample

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
##
2+
## Users
3+
##
4+
5+
# Main user for testing
6+
CYPRESS_MAILCHIMP_USERNAME="your mailchimp username"
7+
CYPRESS_MAILCHIMP_PASSWORD="your mailchimp password"
8+
9+
# Generate API Key: https://mailchimp.com/help/about-api-keys/
10+
CYPRESS_MAILCHIMP_API_KEY="generate an API key from your mailchimp account and paste here" # e.g. "1234567890abcdef1234567890abcdef-us19"
11+
CYPRESS_MAILCHIMP_API_SERVER_PREFIX="" # e.g "us19" - your server prefix may be different

‎.github/workflows/build-release-zip.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ jobs:
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818

1919
- name: Cache node_modules
2020
id: cache-node-modules
21-
uses: actions/cache@v4
21+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
2222
env:
2323
cache-name: cache-node-modules
2424
with:
2525
path: node_modules
2626
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
2727

2828
- name: Setup node version and npm cache
29-
uses: actions/setup-node@v4
29+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
3030
with:
3131
node-version-file: '.nvmrc'
3232
cache: 'npm'
@@ -50,6 +50,6 @@ jobs:
5050
sudo apt-get install subversion
5151
5252
- name: Generate ZIP file
53-
uses: 10up/action-wordpress-plugin-build-zip@stable
53+
uses: 10up/action-wordpress-plugin-build-zip@b9e621e1261ccf51592b6f3943e4dc4518fca0d1 # v1.0.2
5454
env:
55-
SLUG: mailchimp
55+
SLUG: mailchimp

‎.github/workflows/close-stale-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/stale@v9
19+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
2020
with:
2121
days-before-stale: 7
2222
days-before-close: 7

‎.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ jobs:
3434

3535
steps:
3636
- name: Checkout repository
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3838

3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@v3
40+
uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
4141
with:
4242
languages: ${{ matrix.language }}
4343

4444
- name: Autobuild
45-
uses: github/codeql-action/autobuild@v3
45+
uses: github/codeql-action/autobuild@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
4646

4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@v3
48+
uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11

‎.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525

2626
- name: Dependency Review
27-
uses: actions/dependency-review-action@v4
27+
uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3
2828
with:
2929
license-check: true
3030
vulnerability-check: false

‎.github/workflows/e2e.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ jobs:
2020
env:
2121
CYPRESS_MAILCHIMP_USERNAME: ${{ secrets.MAILCHIMP_USERNAME }}
2222
CYPRESS_MAILCHIMP_PASSWORD: ${{ secrets.MAILCHIMP_PASSWORD }}
23+
CYPRESS_MAILCHIMP_API_KEY: ${{ secrets.MAILCHIMP_API_KEY }}
24+
CYPRESS_MAILCHIMP_API_SERVER_PREFIX: ${{ secrets.MAILCHIMP_API_SERVER_PREFIX }}
2325
strategy:
26+
max-parallel: 1
2427
matrix:
2528
core:
2629
- {name: 'WP latest', version: 'latest'}
@@ -29,10 +32,10 @@ jobs:
2932

3033
steps:
3134
- name: Checkout
32-
uses: actions/checkout@v4
35+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3336

3437
- name: Download build zip
35-
uses: actions/download-artifact@v4
38+
uses: actions/download-artifact@b14cf4c92620c250e1c074ab0a5800e37df86765 # v4.2.0
3639
with:
3740
name: ${{ github.event.repository.name }}
3841
path: ${{ github.event.repository.name }}
@@ -41,7 +44,7 @@ jobs:
4144
run: ls -R
4245
working-directory: ${{ github.event.repository.name }}
4346

44-
- uses: actions/setup-node@v4
47+
- uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
4548
with:
4649
node-version-file: '.nvmrc'
4750

@@ -67,7 +70,7 @@ jobs:
6770
cat ./tests/cypress/reports/mochawesome.md >> $GITHUB_STEP_SUMMARY
6871
6972
- name: Upload artifacts
70-
uses: actions/upload-artifact@v4
73+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
7174
if: failure()
7275
with:
7376
name: cypress-artifact-mailchimp

‎.github/workflows/eslint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323

2424
- name: Setup node and npm cache
25-
uses: actions/setup-node@v4
25+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
2626
with:
2727
node-version-file: .nvmrc
2828
cache: npm
@@ -32,7 +32,7 @@ jobs:
3232

3333
- name: Get updated JS files
3434
id: changed-files
35-
uses: tj-actions/changed-files@v44
35+
uses: tj-actions/changed-files@2f7c5bfce28377bc069a65ba478de0a74aa0ca32 # v46.0.1
3636
with:
3737
files: |
3838
**/*.js

‎.github/workflows/php-compat.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222
with:
2323
fetch-depth: 0
2424

2525
- name: Setup proper PHP version
26-
uses: shivammathur/setup-php@v2
26+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
2727
with:
2828
php-version: 8.3
2929

@@ -32,7 +32,7 @@ jobs:
3232
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
3333

3434
- name: Cache dependencies
35-
uses: actions/cache@v4
35+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
3636
with:
3737
path: ${{ steps.composer-cache.outputs.dir }}
3838
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

‎.github/workflows/phpcs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323

2424
- name: Setup proper PHP version
25-
uses: shivammathur/setup-php@v2
25+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
2626
with:
2727
php-version: 8.3
2828

@@ -31,15 +31,15 @@ jobs:
3131
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
3232

3333
- name: Cache dependencies
34-
uses: actions/cache@v4
34+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
3535
with:
3636
path: ${{ steps.composer-cache.outputs.dir }}
3737
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
3838
restore-keys: ${{ runner.os }}-composer-
3939

4040
- name: Get changed files
4141
id: changed-files
42-
uses: tj-actions/changed-files@v44
42+
uses: tj-actions/changed-files@2f7c5bfce28377bc069a65ba478de0a74aa0ca32 # v46.0.1
4343
with:
4444
files: |
4545
**/*.php

‎.github/workflows/repo-automator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- uses: 10up/action-repo-automator@trunk
25+
- uses: 10up/action-repo-automator@280f5dc0b4ed1b5c50c816e08623bdefce55cdce # v2.1.3
2626
with:
2727
fail-label: needs:feedback
2828
pass-label: needs:code-review

‎.github/workflows/wordpress-plugin-asset-update.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212

1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

1717
- name: Setup node version
18-
uses: actions/setup-node@v4
18+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
1919
with:
2020
node-version-file: .nvmrc
2121
cache: npm
@@ -31,7 +31,7 @@ jobs:
3131
npm run build
3232
3333
- name: WordPress.org plugin asset/readme update
34-
uses: 10up/action-wordpress-plugin-asset-update@stable
34+
uses: 10up/action-wordpress-plugin-asset-update@2480306f6f693672726d08b5917ea114cb2825f7 # v2.2.0
3535
env:
3636
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
3737
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

‎.github/workflows/wordpress-plugin-deploy.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212

1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

1717
- name: Setup node version and npm cache
18-
uses: actions/setup-node@v4
18+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
1919
with:
2020
node-version-file: '.nvmrc'
2121
cache: 'npm'
@@ -32,7 +32,7 @@ jobs:
3232
3333
- name: WordPress Plugin Deploy
3434
id: deploy
35-
uses: 10up/action-wordpress-plugin-deploy@stable
35+
uses: 10up/action-wordpress-plugin-deploy@54bd289b8525fd23a5c365ec369185f2966529c2 # v2.3.0
3636
with:
3737
generate-zip: true
3838
env:
@@ -41,10 +41,8 @@ jobs:
4141
SLUG: mailchimp
4242

4343
- name: Attach the wordpress.org plugin files to the Github release
44-
uses: softprops/action-gh-release@v2
44+
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
4545
with:
4646
files: ${{ steps.deploy.outputs.zip-path }}
47-
body: |
48-
This release contains the latest updates for the WordPress plugin.
4947
env:
5048
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/wordpress-version-checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020

2121
steps:
2222
- name: WordPress version checker
23-
uses: skaut/wordpress-version-checker@v2.2.0
23+
uses: skaut/wordpress-version-checker@9d247334f5b30202cb9c1f4aee74c52f37399f69 # v2.2.3
2424
with:
2525
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ dist/*
77
docs-built
88
.phpunit.result.cache
99
/.wp-env.override.json
10+
.env.test
1011

1112
tests/cypress/videos
1213
tests/cypress/screenshots
@@ -16,4 +17,4 @@ tests/cypress/downloads
1617
mailchimp.zip
1718

1819
# IDE
19-
.vscode
20+
.vscode

0 commit comments

Comments
 (0)