Skip to content

Commit bbd4469

Browse files
committed
Fix some more environment variable usage.
1 parent e1116d1 commit bbd4469

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.github/workflows/reusable-cleanup-pull-requests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ jobs:
3333
COMMIT_MSG_RAW: ${{ github.event.head_commit.message }}
3434
run: |
3535
COMMIT_MESSAGE=$(echo "$COMMIT_MSG_RAW" | sed -n '/^Fixes #/,/\./p')
36-
echo "fixed_list=$(echo \"$COMMIT_MESSAGE\" | sed -n 's/.*Fixes #\([0-9]\+\).*/\1/p' | tr '\n' ' ')" >> $GITHUB_OUTPUT
36+
echo "fixed_list=$(echo "$COMMIT_MESSAGE" | sed -n 's/.*Fixes #\([0-9]\+\).*/\1/p' | tr '\n' ' ')" >> $GITHUB_OUTPUT
3737
3838
- name: Get the SVN revision
3939
id: git-svn-id
4040
env:
4141
COMMIT_MSG_RAW: ${{ github.event.head_commit.message }}
4242
run: |
4343
COMMIT_MESSAGE=$(echo "$COMMIT_MSG_RAW" | sed -n '$p')
44-
echo "svn_revision_number=$(echo \"$COMMIT_MESSAGE\" | sed -n 's/.*git-svn-id: https:\/\/develop.svn.wordpress.org\/[^@]*@\([0-9]*\) .*/\1/p')" >> $GITHUB_OUTPUT
44+
echo "svn_revision_number=$(echo "$COMMIT_MESSAGE" | sed -n 's/.*git-svn-id: https:\/\/develop.svn.wordpress.org\/[^@]*@\([0-9]*\) .*/\1/p')" >> $GITHUB_OUTPUT
4545
4646
- name: Find pull requests
4747
id: linked-prs

.github/workflows/reusable-performance.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -337,12 +337,6 @@ jobs:
337337
});
338338
return baseRef.data.object.sha;
339339
340-
- name: Set commit details
341-
# Only needed when publishing results.
342-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' && ! inputs.memcached && ! inputs.multisite }}
343-
# Write to an environment variable to have the output available in later steps of the job.
344-
run: echo "COMMITTED_AT=$(git show -s $GITHUB_SHA --format='%cI')" >> $GITHUB_ENV
345-
346340
- name: Publish performance results
347341
# Only publish results on pushes to trunk.
348342
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' && ! inputs.memcached && ! inputs.multisite }}
@@ -355,6 +349,7 @@ jobs:
355349
echo "Performance results could not be published. 'CODEVITALS_PROJECT_TOKEN' is not set"
356350
exit 1
357351
fi
352+
COMMITTED_AT="$(git show -s "$GITHUB_SHA" --format='%cI')"
358353
node ./tests/performance/log-results.js "$CODEVITALS_PROJECT_TOKEN" trunk "$GITHUB_SHA" "$BASE_SHA" "$COMMITTED_AT" "$HOST_NAME"
359354
360355
- name: Ensure version-controlled files are not modified or deleted

.github/workflows/reusable-phpunit-tests-v1.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ jobs:
146146
if: ${{ inputs.memcached }}
147147
run: |
148148
cp tests/phpunit/includes/object-cache.php build/wp-content/object-cache.php
149-
docker run --name memcached --net $(basename "$PWD")_wpdevnet -d memcached
149+
BASE=$(basename "$PWD")
150+
docker run --name memcached --net "${BASE}_wpdevnet" -d memcached
150151
151152
- name: General debug information
152153
run: |

0 commit comments

Comments
 (0)