Skip to content

Commit 686e07b

Browse files
committed
Merge branch 'develop' into trunk
2 parents 3cc8ffd + 3561223 commit 686e07b

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.github/workflows/deploy-to-dotorg.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
name: Deploy to WordPress.org
2+
23
on:
34
release:
45
types: [published]
6+
57
jobs:
68
tag:
79
name: New release
810
runs-on: ubuntu-latest
911
steps:
1012
- name: Checkout code
11-
uses: actions/checkout@v2
13+
uses: actions/checkout@v3
14+
15+
- name: Setup node version
16+
uses: actions/setup-node@v3
17+
with:
18+
node-version: 16
19+
1220
- name: Build
1321
run: |
1422
npm run build-release
23+
1524
- name: WordPress Plugin Deploy
1625
id: deploy
1726
uses: 10up/action-wordpress-plugin-deploy@stable
@@ -21,6 +30,7 @@ jobs:
2130
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
2231
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
2332
SLUG: ad-refresh-control
33+
2434
- name: Upload release asset
2535
uses: actions/upload-release-asset@v1
2636
env:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file, per [the Ke
77
## [1.1.2] - 2023-05-31
88
### Changed
99
- Bump WordPress "tested up to" version 6.2 (props [@Sidsector9](https://github.com/Sidsector9), [@iamdharmesh](https://github.com/iamdharmesh) via [#110](https://github.com/10up/Ad-Refresh-Control/pull/110)).
10-
- Documentation updates (props [@barryceelen](https://github.com/barryceelen), [@jeffpaul](https://github.com/jeffpaul) via [#104](https://github.com/10up/Ad-Refresh-Control/pull/104)).
10+
- Documentation & deploy action updates (props [@barryceelen](https://github.com/barryceelen), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#104](https://github.com/10up/Ad-Refresh-Control/pull/104), [#116](https://github.com/10up/Ad-Refresh-Control/pull/116)).
1111

1212
### Security
1313
- Bump `minimist` from 1.2.0 to 1.2.8 (props [@dependabot](https://github.com/apps/dependabot), [@cadic](https://github.com/cadic) via [#105](https://github.com/10up/Ad-Refresh-Control/pull/105)).

readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ __Slot IDs to Exclude__: Prevent ad refreshes for specific slot IDs in the forma
5151

5252
= 1.1.2 - 2023-05-31 =
5353
* **Changed:** Bump WordPress "tested up to" version 6.2 (props [@Sidsector9](https://github.com/Sidsector9), [@iamdharmesh](https://github.com/iamdharmesh) via [#110](https://github.com/10up/Ad-Refresh-Control/pull/110)).
54-
* **Changed:** Documentation updates (props [@barryceelen](https://github.com/barryceelen), [@jeffpaul](https://github.com/jeffpaul) via [#104](https://github.com/10up/Ad-Refresh-Control/pull/104)).
54+
* **Changed:** Documentation & deploy action updates (props [@barryceelen](https://github.com/barryceelen), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#104](https://github.com/10up/Ad-Refresh-Control/pull/104), [#116](https://github.com/10up/Ad-Refresh-Control/pull/116)).
5555
* **Security:** Bump `minimist` from 1.2.0 to 1.2.8 (props [@dependabot](https://github.com/apps/dependabot), [@cadic](https://github.com/cadic) via [#105](https://github.com/10up/Ad-Refresh-Control/pull/105)).
5656
* **Security:** Bump `mkdirp` from 0.5.1 to 0.5.6 (props [@dependabot](https://github.com/apps/dependabot), [@cadic](https://github.com/cadic) via [#105](https://github.com/10up/Ad-Refresh-Control/pull/105)).
5757
* **Security:** Bump `loader-fs-cache` from 1.0.2 to 1.0.3 (props [@dependabot](https://github.com/apps/dependabot), [@cadic](https://github.com/cadic) via [#105](https://github.com/10up/Ad-Refresh-Control/pull/105)).

0 commit comments

Comments
 (0)