Skip to content

Commit

Permalink
feat: remove deprecated input
Browse files Browse the repository at this point in the history
* fix: re-add current branch fallback

Co-authored-by: Volodymyr Shelmuk <[email protected]>
Signed-off-by: Philipp Bammes <[email protected]>

* fix: remove condition

* Revert "fix: remove condition"

This reverts commit 2d233e0.

---------

Signed-off-by: Philipp Bammes <[email protected]>
Co-authored-by: Volodymyr Shelmuk <[email protected]>
Co-authored-by: Luis Rosales <[email protected]>
  • Loading branch information
3 people authored Aug 22, 2024
1 parent f09664f commit b8fe99e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/build-and-push-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ on:
default: ''
required: false
type: string
BUILT_BRANCH_SUFFIX:
description: Suffix to calculate the target branch for pushing assets on the `branch` event (deprecated).
type: string
default: ''
required: false
BUILT_BRANCH_NAME:
description: Sets the target branch for pushing assets on the `branch` event.
type: string
Expand Down Expand Up @@ -152,11 +147,6 @@ jobs:
LOCK_FILE: '' # we'll override after checking files
NO_CHANGES: '' # we'll override if no changes to commit
steps:
- name: Deprecation warning
if: ${{ inputs.BUILT_BRANCH_SUFFIX != '' }}
run: |
echo '::warning::The BUILT_BRANCH_SUFFIX input is deprecated and will be removed soon. Please update your workflow to use BUILT_BRANCH_NAME with ${{ github.ref_name }}-built.'
- name: Checkout
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -212,7 +202,7 @@ jobs:
- name: Set branch environment variables
if: ${{ github.ref_type == 'branch' }}
run: |
echo "BUILT_BRANCH_NAME=${{ inputs.BUILT_BRANCH_NAME && inputs.BUILT_BRANCH_NAME || format('{0}{1}', github.ref_name, inputs.BUILT_BRANCH_SUFFIX) }}" >> $GITHUB_ENV
echo "BUILT_BRANCH_NAME=${{ inputs.BUILT_BRANCH_NAME && inputs.BUILT_BRANCH_NAME || github.ref_name }}" >> $GITHUB_ENV
- name: Set tag environment variables
if: ${{ github.ref_type == 'tag' }}
Expand Down Expand Up @@ -290,7 +280,7 @@ jobs:
git commit -m "[BOT] Add compiled assets for #${{ github.ref }}" --no-verify || ((echo "NO_CHANGES=yes" >> $GITHUB_ENV) && (echo "No changes to commit"))
- name: Git push for branch
if: ${{ github.ref_type == 'branch' && (env.NO_CHANGES != 'yes' || inputs.BUILT_BRANCH_SUFFIX != '' || inputs.BUILT_BRANCH_NAME != '') }}
if: ${{ github.ref_type == 'branch' && (env.NO_CHANGES != 'yes' || inputs.BUILT_BRANCH_NAME != '') }}
run: git push

- name: Git push for tag
Expand Down
1 change: 0 additions & 1 deletion docs/build-and-push-assets.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ This is not the simplest possible example, but it showcases all the recommendati
| `MODE` | `''` | Mode for compiling assets (`prod` or `dev`) |
| `ASSETS_TARGET_PATHS` | `'./assets'` | Space-separated list of target directory paths for compiled assets |
| `ASSETS_TARGET_FILES` | `''` | Space-separated list of target file paths for compiled assets |
| `BUILT_BRANCH_SUFFIX` | `''` | :warning: deprecated - Suffix to calculate the target branch for pushing assets on the `branch` event |
| `BUILT_BRANCH_NAME` | `''` | Sets the target branch for pushing assets on the `branch` event |
| `RELEASE_BRANCH_NAME` | `''` | On tag events, target branch where compiled assets are pushed and the tag is moved to |
| `PHP_VERSION` | `'8.0'` | PHP version with which the PHP tools are to be executed |
Expand Down

0 comments on commit b8fe99e

Please sign in to comment.