Skip to content
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.

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

fix(UX-1297): Add both round and sharp icons to ZDS Android #58

Merged
merged 4 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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