Skip to content

Commit

Permalink
fix(UX-1297): Add both round and sharp icons to ZDS Android (#58)
Browse files Browse the repository at this point in the history
ci :Update copy script to fail gracefully
---------

Co-authored-by: github-actions <[email protected]>
  • Loading branch information
thelukewalton and github-actions authored Oct 25, 2024
1 parent c96c346 commit a80f61f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/copy-content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
repository: ${{ inputs.repo }}
token: ${{ secrets.PAT }}
ref: ${{ inputs.branch }}
fetch-depth: 0

- name: Checkout destination repo (Branch doesn't exist)
uses: actions/checkout@v4
Expand All @@ -62,6 +63,7 @@ jobs:
path: "destination"
repository: ${{ inputs.repo }}
token: ${{ secrets.PAT }}
fetch-depth: 0

- name: Create branch in destination repo
if: ${{ steps.check_branch.outputs.branch_exists == 0 }}
Expand All @@ -82,22 +84,13 @@ jobs:
- name: Copy files
run: cp -r source/${{ inputs.source_dir }}/* destination/${{ inputs.destination_dir }}

- name: Stage destination changes
- name: Stage / Push destination changes
continue-on-error: true
run: |
cd destination
git config --global user.name "zeta-icons-bot"
git config --global user.email "[email protected]"
git add -A
- name: Check if there are changes
id: changed
run: |
cd destination
git diff --quiet . || echo "changed=true" >> $GITHUB_OUTPUT
- name: Commit and push changes
if: steps.changed.outputs.changed == 'true'
run: |
git commit -m "deps(automated): ${{inputs.commit_msg}} ${{ steps.date.outputs.date }}"
git push --set-upstream origin ${{inputs.branch}} -f
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_zds_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
repo: ZebraDevs/zds-android
branch: "update-zeta-icons"
source_dir: "./outputs/android/."
source_dir: "outputs/android"
destination_dir: "components/src/main/res/drawable"
commit_msg: "Update icons"
prerun: rm -f components/src/main/res/drawable/ic_*.xml

0 comments on commit a80f61f

Please sign in to comment.