Skip to content

Commit e5d398a

Browse files
vytisbulkeviciusvytisbulkevicius
authored
release: fixes
- Fixed early translations loading error - Update dependencies
2 parents 832de91 + 2c90f70 commit e5d398a

File tree

11 files changed

+85
-141
lines changed

11 files changed

+85
-141
lines changed

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

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build and publish the ZIP build file
22

33
on:
44
pull_request:
5-
types: [ opened, synchronize, ready_for_review ]
5+
types: [opened, synchronize, ready_for_review]
66
branches-ignore:
77
- "update_dependencies"
88
jobs:
@@ -16,20 +16,10 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@master
1818
- name: Setup node 14
19-
uses: actions/setup-node@v1
19+
uses: actions/setup-node@v4
2020
with:
2121
node-version: 14.x
22-
- name: Get Composer Cache Directory
23-
id: composer-cache
24-
run: |
25-
echo "::set-output name=dir::$(composer config cache-files-dir)"
26-
- name: Configure Composer cache
27-
uses: actions/cache@v1
28-
with:
29-
path: ${{ steps.composer-cache.outputs.dir }}
30-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
31-
restore-keys: |
32-
${{ runner.os }}-composer-
22+
cache: "yarn"
3323
- name: Install composer deps
3424
run: composer install --no-dev --prefer-dist --no-progress --no-suggest
3525
- name: Install yarn deps
@@ -102,4 +92,4 @@ jobs:
10292
comment-id: ${{ steps.find-comment.outputs.comment-id }}
10393
token: ${{ secrets.BOT_TOKEN }}
10494
edit-mode: replace
105-
body: ${{ steps.get-comment-body.outputs.body }}
95+
body: ${{ steps.get-comment-body.outputs.body }}

‎.github/workflows/create-tag.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,7 @@ jobs:
1919
uses: actions/setup-node@v1
2020
with:
2121
node-version: ${{ matrix.node-version }}
22-
- name: Get yarn cache directory path
23-
id: yarn-cache-dir-path
24-
run: echo "::set-output name=dir::$(yarn cache dir)"
25-
- uses: actions/cache@v2
26-
id: yarn-cache
27-
with:
28-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
29-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
30-
restore-keys: |
31-
${{ runner.os }}-yarn-
22+
cache: "yarn"
3223
- name: Release new version
3324
id: release
3425
run: |
@@ -53,4 +44,4 @@ jobs:
5344
steps:
5445
- name: Meep
5546
run: |
56-
echo "Nothing to do"
47+
echo "Nothing to do"

‎.github/workflows/deploy-s3-store.yml‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,10 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@master
1313
- name: Setup node 14
14-
uses: actions/setup-node@v1
14+
uses: actions/setup-node@v4
1515
with:
1616
node-version: 14.x
17-
- name: Get yarn cache directory path
18-
id: yarn-cache-dir-path
19-
run: echo "::set-output name=dir::$(yarn cache dir)"
20-
- uses: actions/cache@v2
21-
id: yarn-cache
22-
with:
23-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
24-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
25-
restore-keys: |
26-
${{ runner.os }}-yarn-
17+
cache: "yarn"
2718
- name: Build & create dist/artifact
2819
run: |
2920
yarn install --frozen-lockfile
@@ -43,8 +34,8 @@ jobs:
4334
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET_DOWNLOADS }}
4435
AWS_ACCESS_KEY_ID: ${{ secrets.S3_DOWNLOADS_AWS_ACCESS_KEY_ID }}
4536
AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DOWNLOADS_AWS_SECRET_ACCESS_KEY }}
46-
AWS_REGION: 'us-west-1' # optional: defaults to us-east-1
47-
SOURCE_DIR: 'artifact' # optional: defaults to entire repository
37+
AWS_REGION: "us-west-1" # optional: defaults to us-east-1
38+
SOURCE_DIR: "artifact" # optional: defaults to entire repository
4839
DEST_DIR: ${{ secrets.S3_AWS_PRODUCTS_FOLDER }}/$BUILD_NAME/latest
4940
- name: Upload Tagged Version to S3
5041
uses: jakejarvis/s3-sync-action@master
@@ -54,8 +45,8 @@ jobs:
5445
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET_DOWNLOADS }}
5546
AWS_ACCESS_KEY_ID: ${{ secrets.S3_DOWNLOADS_AWS_ACCESS_KEY_ID }}
5647
AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DOWNLOADS_AWS_SECRET_ACCESS_KEY }}
57-
AWS_REGION: 'us-west-1' # optional: defaults to us-east-1
58-
SOURCE_DIR: 'artifact' # optional: defaults to entire repository
48+
AWS_REGION: "us-west-1" # optional: defaults to us-east-1
49+
SOURCE_DIR: "artifact" # optional: defaults to entire repository
5950
DEST_DIR: ${{ secrets.S3_AWS_PRODUCTS_FOLDER }}/$BUILD_NAME/$BUILD_VERSION
6051
- name: Send update to the store
6152
env:
@@ -64,4 +55,4 @@ jobs:
6455
STORE_URL: ${{ secrets.THEMEISLE_STORE_URL }}
6556
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
6657
BUILD_VERSION: ${{ env.BUILD_VERSION }}
67-
uses: Codeinwp/action-store-release@main
58+
uses: Codeinwp/action-store-release@main

‎.github/workflows/diff-translations.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ on:
55
pull_request:
66
types: [opened, edited, synchronize, ready_for_review]
77
branches:
8-
- 'development'
8+
- "development"
99

1010
jobs:
1111
translation:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout Ref Base
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616
with:
1717
path: raft-head
1818
- name: Setup node 14
19-
uses: actions/setup-node@v1
19+
uses: actions/setup-node@v4
2020
with:
2121
node-version: 14.x
2222
- name: FRESH Makepot BASE
@@ -28,7 +28,7 @@ jobs:
2828
yarn run build
2929
ls languages/
3030
- name: Checkout Ref Head
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v4
3232
with:
3333
ref: development
3434
path: raft-base
@@ -45,7 +45,7 @@ jobs:
4545
id: find_coomment
4646
with:
4747
issue-number: ${{ github.event.pull_request.number }}
48-
comment-author: 'pirate-bot'
48+
comment-author: "pirate-bot"
4949
body-includes: PR has POT difference
5050
- name: Install PODiff
5151
run: |
@@ -71,4 +71,4 @@ jobs:
7171
teams:
7272
- "sbs"
7373
status: Has translation changes, a review from SBS team is required
74-
token: ${{ secrets.BOT_TOKEN }}
74+
token: ${{ secrets.BOT_TOKEN }}

‎.github/workflows/test-js.yml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Test JS
33
on:
44
push:
55
branches-ignore:
6-
- 'master'
6+
- "master"
77

88
jobs:
99
jslint:
@@ -16,22 +16,13 @@ jobs:
1616
- name: Checkout source code
1717
uses: actions/checkout@master
1818
- name: Setup node
19-
uses: actions/setup-node@v1
19+
uses: actions/setup-node@v4
2020
with:
2121
node-version: ${{ matrix.node-version }}
22-
- name: Get yarn cache directory path
23-
id: yarn-cache-dir-path
24-
run: echo "::set-output name=dir::$(yarn cache dir)"
25-
- uses: actions/cache@v2
26-
id: yarn-cache
27-
with:
28-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
29-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
30-
restore-keys: |
31-
${{ runner.os }}-yarn-
22+
cache: "yarn"
3223
- name: Install Dependencies
3324
run: yarn install --frozen-lockfile
3425
- name: Build source
3526
run: yarn run build
3627
- name: Run lint checks
37-
run: yarn run lint
28+
run: yarn run lint

‎.github/workflows/test-php.yml‎

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,27 @@ name: Test PHP
33
on:
44
push:
55
branches-ignore:
6-
- 'master'
6+
- "master"
77

88
jobs:
99
phplint:
1010
name: Phplint
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Setup PHP version
1414
uses: shivammathur/setup-php@v2
1515
with:
16-
php-version: '7.2'
16+
php-version: "7.2"
1717
extensions: simplexml
1818
- name: Checkout source code
19-
uses: actions/checkout@v2
20-
- name: Get Composer Cache Directory
21-
id: composer-cache
22-
run: |
23-
echo "::set-output name=dir::$(composer config cache-files-dir)"
24-
- name: Setup Composer cache
25-
uses: actions/cache@v1
26-
with:
27-
path: ${{ steps.composer-cache.outputs.dir }}
28-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
29-
restore-keys: |
30-
${{ runner.os }}-composer-
19+
uses: actions/checkout@v4
3120
- name: Install composer
3221
run: composer install --prefer-dist --no-progress --no-suggest
3322
- name: Run PHPCS
3423
run: composer run lint
3524
phpunit:
3625
name: Phpunit
37-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-22.04
3827
services:
3928
mysql:
4029
image: mysql:5.7
@@ -47,26 +36,15 @@ jobs:
4736
- name: Setup PHP version
4837
uses: shivammathur/setup-php@v2
4938
with:
50-
php-version: '7.2'
39+
php-version: "7.2"
5140
extensions: simplexml, mysql
5241
tools: phpunit-polyfills
5342
- name: Checkout source code
54-
uses: actions/checkout@v2
43+
uses: actions/checkout@v4
5544
- name: Install WordPress Test Suite
5645
run: |
5746
bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1:${{ job.services.mysql.ports['3306'] }}
58-
- name: Get Composer Cache Directory
59-
id: composer-cache
60-
run: |
61-
echo "::set-output name=dir::$(composer config cache-files-dir)"
62-
- name: Setup Composer cache
63-
uses: actions/cache@v1
64-
with:
65-
path: ${{ steps.composer-cache.outputs.dir }}
66-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
67-
restore-keys: |
68-
${{ runner.os }}-composer-
6947
- name: Install composer
7048
run: composer install --prefer-dist --no-progress --no-suggest
7149
- name: Run phpunit
72-
run: composer run-script phpunit
50+
run: composer run-script phpunit

‎composer.lock‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎functions.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ function define_constants() {
7171
define( 'RAFT_DEBUG', defined( 'WP_DEBUG' ) && WP_DEBUG === true );
7272
define( 'RAFT_DIR', trailingslashit( get_template_directory() ) );
7373
define( 'RAFT_URL', trailingslashit( get_template_directory_uri() ) );
74+
define( 'RAFT_PRODUCT_SLUG', basename( RAFT_DIR ) );
7475
}
7576

7677
/**

0 commit comments

Comments
 (0)