Skip to content

Fix a small bug in the dependency CI #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2024
Merged

Fix a small bug in the dependency CI #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a4a7b2
Fix a small bug in the dependency CI
estevao90 Dec 20, 2024
9aea601
Fix a small bug in the dependency CI
estevao90 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .github/workflows/dependency-zip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,13 @@ jobs:
needs:
- prepare

# If the head branch is main, we don't need to check the dependency branch, as we will use the release zip.
if: ${{ needs.prepare.outputs.is-main == 'false' }}

outputs:
branch-to-checkout: ${{ steps.output_values.outputs.dependency_branch }}
is-main: ${{ steps.output_values.outputs.dependency_branch == inputs.main-branch }}

steps:
- name: Checkout dependency to verify the available branches
if: ${{ needs.prepare.outputs.is-main == 'false' }}
uses: actions/checkout@v4
with:
repository: ${{ inputs.repository }}
Expand All @@ -98,6 +96,12 @@ jobs:
- name: Check if the required branch exists
id: output_values
run: |

if [ "${{ needs.prepare.outputs.is-main }}" = "true" ]; then
echo "dependency_branch=${{ inputs.main-branch }}" >> $GITHUB_OUTPUT
exit 0
fi

cd ${{ needs.prepare.outputs.checkout-path }}

head_branch_exists=$(git ls-remote --heads origin ${{ needs.prepare.outputs.head-branch }} | wc -l)
Expand Down Expand Up @@ -127,7 +131,7 @@ jobs:

steps:
- name: Checkout dependency
if: ${{ needs.prepare.outputs.is-main == 'false' && needs.check-branch.outputs.is-main == 'false' }}
if: ${{ needs.check-branch.outputs.is-main == 'false' }}
uses: actions/checkout@v4
with:
repository: ${{ inputs.repository }}
Expand All @@ -137,15 +141,15 @@ jobs:
token: ${{ secrets.GITHUB_CHECKOUT_TOKEN }}

- name: Define the dependency zip name
if: ${{ needs.prepare.outputs.is-main == 'false' && needs.check-branch.outputs.is-main == 'false' }}
if: ${{ needs.check-branch.outputs.is-main == 'false' }}
run: |
cd ${{ needs.prepare.outputs.checkout-path }}
composer -- pup
version=$(composer -- pup get-version --dev)
echo "DEPENDENCY_ZIP_NAME=$(composer -- pup zip-name $version).zip" >> $GITHUB_ENV

- name: Check if the zip exists in S3
if: ${{ needs.prepare.outputs.is-main == 'false' && needs.check-branch.outputs.is-main == 'false' }}
if: ${{ needs.check-branch.outputs.is-main == 'false' }}
uses: the-events-calendar/action-s3-utility@main
id: s3_zip_exists
continue-on-error: true
Expand All @@ -163,7 +167,7 @@ jobs:
run: |

# use the release zip if the file does not exists or is main
if [ "${{ needs.prepare.outputs.is-main }}" = "true" ] || [ "${{ needs.check-branch.outputs.is-main }}" = "true" ] || [ "${{ steps.s3_zip_exists.outcome }}" != "success" ]; then
if [ "${{ needs.check-branch.outputs.is-main }}" = "true" ] || [ "${{ steps.s3_zip_exists.outcome }}" != "success" ]; then
echo 'use-release=true' >> $GITHUB_OUTPUT
else
echo 'use-release=false' >> $GITHUB_OUTPUT
Expand Down