Skip to content

Commit 139df9f

Browse files
authored
fix(ci): expand bot git identity vars and format altstore source with oxfmt (#1527)
… <!-- Please read https://github.com/SableClient/Sable/blob/dev/CONTRIBUTING.md before submitting your pull request --> ### Description <!-- Please include a summary of the change. Please also include relevant motivation and context. List any dependencies that are required for this change. --> Fixes # #### Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update ### Checklist: - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings ### AI disclosure: - [ ] Partially AI assisted (clarify which code was AI assisted and briefly explain what it does). - [ ] Fully AI generated (explain what all the generated code does in moderate detail). <!-- Write any explanation required here, but do not generate the explanation using AI!! You must prove you understand what the code in this PR does. -->
2 parents fc97592 + 06895c0 commit 139df9f

3 files changed

Lines changed: 7 additions & 10 deletions

File tree

.github/workflows/flake-lock-fix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949

5050
- name: Configure bot git identity
5151
run: |
52-
git config --global user.name '${STEPS_APP_TOKEN_OUTPUTS_APP_SLUG}[bot]'
53-
git config --global user.email '${STEPS_GET_USER_ID_OUTPUTS_USER_ID}+${STEPS_APP_TOKEN_OUTPUTS_APP_SLUG}[bot]@users.noreply.github.com'
52+
git config --global user.name "${STEPS_APP_TOKEN_OUTPUTS_APP_SLUG}[bot]"
53+
git config --global user.email "${STEPS_GET_USER_ID_OUTPUTS_USER_ID}+${STEPS_APP_TOKEN_OUTPUTS_APP_SLUG}[bot]@users.noreply.github.com"
5454
gh auth setup-git
5555
env:
5656
GH_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/tauri-build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,8 +519,8 @@ jobs:
519519

520520
- name: Configure bot git identity
521521
run: |
522-
git config --global user.name '${STEPS_APP_TOKEN_OUTPUTS_APP_SLUG}[bot]'
523-
git config --global user.email '${STEPS_GET_USER_ID_OUTPUTS_USER_ID}+${STEPS_APP_TOKEN_OUTPUTS_APP_SLUG}[bot]@users.noreply.github.com'
522+
git config --global user.name "${STEPS_APP_TOKEN_OUTPUTS_APP_SLUG}[bot]"
523+
git config --global user.email "${STEPS_GET_USER_ID_OUTPUTS_USER_ID}+${STEPS_APP_TOKEN_OUTPUTS_APP_SLUG}[bot]@users.noreply.github.com"
524524
gh auth setup-git
525525
env:
526526
GH_TOKEN: ${{ steps.app-token.outputs.token }}
@@ -557,6 +557,7 @@ jobs:
557557
git worktree add --detach "$WT" origin/dev
558558
node .github/scripts/update-altstore-source.mjs \
559559
"$WT/$SOURCE_FILE" "${ALTSTORE_VERSION:-$VERSION}" "${ALTSTORE_VERSION_BUILD:-$VERSION}" "${STEPS_IPA_OUTPUTS_SIZE}" "$DOWNLOAD_URL" "$DATE" "Sable $VERSION"
560+
pnpm oxfmt "$WT/$SOURCE_FILE"
560561
git -C "$WT" add "$SOURCE_FILE"
561562
if git -C "$WT" diff --cached --quiet; then
562563
echo "$SOURCE_FILE already up to date on dev"

altstore-source-nightly.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
"iconURL": "https://raw.githubusercontent.com/SableClient/Sable/dev/src-tauri/icons/icon.png",
77
"website": "https://github.com/SableClient/Sable",
88
"tintColor": "#5CA399",
9-
"featuredApps": [
10-
"moe.sable.client"
11-
],
9+
"featuredApps": ["moe.sable.client"],
1210
"apps": [
1311
{
1412
"name": "Sable",
@@ -31,9 +29,7 @@
3129
}
3230
],
3331
"appPermissions": {
34-
"entitlements": [
35-
"aps-environment"
36-
],
32+
"entitlements": ["aps-environment"],
3733
"privacy": {
3834
"NSCameraUsageDescription": "Sable needs camera access for video calls.",
3935
"NSMicrophoneUsageDescription": "Sable needs microphone access for voice and video calls."

0 commit comments

Comments
 (0)