Skip to content

fix: issues parsing Xcode 16 projects #862

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 3 commits into from
Oct 8, 2024
Merged

fix: issues parsing Xcode 16 projects #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d98e459
Fix the parsing of some Xcode 16 projects
pepicrft Oct 1, 2024
037ac54
Fix tests
pepicrft Oct 8, 2024
31bdab9
Fix release notes that all include an [unreleased] version at the top
pepicrft Oct 8, 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
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:
inputs:
version:
description: 'The version to release'
description: "The version to release"
type: string

permissions:
Expand All @@ -19,7 +19,7 @@ permissions:
jobs:
release:
name: Release
runs-on: 'ubuntu-latest'
runs-on: "ubuntu-latest"
timeout-minutes: 15
if: "!startsWith(github.event.head_commit.message, '[Release]')"
steps:
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
echo "RELEASE_NOTES<<EOF" >> "$GITHUB_OUTPUT"
git cliff 8.22.0.. --unreleased >> "$GITHUB_OUTPUT"
git cliff 8.22.0.. --bump --unreleased >> "$GITHUB_OUTPUT"
echo "EOF" >> "$GITHUB_OUTPUT"
- name: Update CHANGELOG.md
if: env.should-release == 'true'
Expand All @@ -74,7 +74,7 @@ jobs:
uses: stefanzweifel/git-auto-commit-action@v5
if: env.should-release == 'true'
with:
commit_options: '--allow-empty'
commit_options: "--allow-empty"
tagging_message: ${{ steps.next-version.outputs.NEXT_VERSION }}
skip_dirty_check: true
commit_message: "[Release] XcodeProj ${{ steps.next-version.outputs.NEXT_VERSION }}"
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/xcodeproj.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: Select Xcode 16
run: sudo xcode-select -switch /Applications/Xcode_16.app/Contents/Developer
- uses: jdx/mise-action@v2
- name: Build
run: mise run build
Expand All @@ -36,6 +38,8 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: Select Xcode 16
run: sudo xcode-select -switch /Applications/Xcode_16.app/Contents/Developer
- uses: jdx/mise-action@v2
- name: Run tests
run: mise run test
Expand All @@ -54,5 +58,7 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: Select Xcode 16
run: sudo xcode-select -switch /Applications/Xcode_16.app/Contents/Developer
- uses: jdx/mise-action@v2
- run: mise run lint
13 changes: 12 additions & 1 deletion Fixtures/SynchronizedRootGroups/SynchronizedRootGroups.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,18 @@
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
6CF05B9D2C53F64800EF267F /* SynchronizedRootGroups */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (6CF05BA32C53F97F00EF267F /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = SynchronizedRootGroups; sourceTree = "<group>"; };
6CF05B9D2C53F64800EF267F /* SynchronizedRootGroups */ = {
isa = PBXFileSystemSynchronizedRootGroup;
exceptions = (
6CF05BA32C53F97F00EF267F /* PBXFileSystemSynchronizedBuildFileExceptionSet */,
);
explicitFileTypes = {
};
explicitFolders = (
);
path = SynchronizedRootGroups;
sourceTree = "<group>";
};
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down
3 changes: 3 additions & 0 deletions Fixtures/Xcode16/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Xcode 16 project

Xcode 16 introduced some changes in Xcode projects, like [this one](https://github.com/tuist/XcodeProj/issues/861), so this fixture tries to capture those changes to run tests against them.
Loading
Loading