letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Move the Acknowledgements generation to the post-renovate workflow. (#5438)

Browse Source 
* Move the Acknowledgements generation to the post-renovate workflow.

* Use macOS 26.
This commit is contained in:
Doug
2026-04-17 14:26:08 +01:00
committed by GitHub
parent 795ad9b256
commit b7951d8f51
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.githooks/pre-commit
View File

@@ -9,10 +9,4 @@ then
exit 1 exit 1
fi fi
swift-package-list ElementX.xcodeproj --requires-license --ignore-package compound-ios --ignore-package compound-design-tokens --ignore-package matrix-rich-text-editor-swift --ignore-package element-call-swift --output-type settings-bundle --output-path ElementX/SupportingFiles
if ! git diff --quiet -- ./ElementX/SupportingFiles/Settings.bundle || [ -n "$(git ls-files --others --exclude-standard -- ./ElementX/SupportingFiles/Settings.bundle)" ]; then
echo "pre-commit: Commit aborted due to unstaged changes to the package Acknowledgements."
exit 1
fi
./Tools/Scripts/validate_lfs.sh ./Tools/Scripts/validate_lfs.sh

12
.github/workflows/renovate-xcodegen.yml vendored
View File

@@ -11,7 +11,7 @@ permissions: {}
jobs: jobs:
update-project: update-project:
name: Update Xcode project name: Update Xcode project
runs-on: macos-15 runs-on: macos-26
timeout-minutes: 20 timeout-minutes: 20
permissions: permissions:
contents: write contents: write
@@ -32,11 +32,11 @@ jobs:
# We need to push any changes to the project. # We need to push any changes to the project.
persist-credentials: true persist-credentials: true
- name: Install XcodeGen - name: Install dependencies
run: | run: |
unset HOMEBREW_NO_INSTALL_FROM_API unset HOMEBREW_NO_INSTALL_FROM_API
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew install xcodegen brew install xcodegen FelixHerrmann/tap/swift-package-list
- name: Run XcodeGen - name: Run XcodeGen
run: xcodegen run: xcodegen
@@ -44,11 +44,15 @@ jobs:
- name: Resolve package dependencies - name: Resolve package dependencies
run: xcodebuild -resolvePackageDependencies -project ElementX.xcodeproj run: xcodebuild -resolvePackageDependencies -project ElementX.xcodeproj
- name: Update Acknowledgements
run: swift-package-list ElementX.xcodeproj --requires-license --ignore-package compound-ios --ignore-package compound-design-tokens --ignore-package matrix-rich-text-editor-swift --ignore-package element-call-swift --output-type settings-bundle --output-path ElementX/SupportingFiles
- name: Commit and push changes - name: Commit and push changes
run: | run: |
git config user.name "ElementRobot" git config user.name "ElementRobot"
git config user.email "releases@riot.im" git config user.email "releases@riot.im"
git add ElementX.xcodeproj/project.pbxproj git add ElementX.xcodeproj/project.pbxproj
git add ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved git add ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
git diff --staged --quiet || git commit -m "Run XcodeGen and update Package.resolved" git add ElementX/SupportingFiles/Settings.bundle
git diff --staged --quiet || git commit -m "Run XcodeGen, update Package.resolved and Settings.bundle"
git push git push

2
Tools/Sources/Commands/SetupProject.swift
View File

@@ -17,7 +17,7 @@ struct SetupProject: ParsableCommand {
} }
func brewInstall() throws { func brewInstall() throws {
try Zsh.run(command: "brew install xcodegen swiftgen swiftformat git-lfs sourcery mint pkl kiliankoe/formulae/swift-outdated localazy/tools/localazy peripheryapp/periphery/periphery FelixHerrmann/tap/swift-package-list") try Zsh.run(command: "brew install xcodegen swiftgen swiftformat git-lfs sourcery mint pkl kiliankoe/formulae/swift-outdated localazy/tools/localazy peripheryapp/periphery/periphery")
} }
func mintPackagesInstall() throws { func mintPackagesInstall() throws {