From 271366c3764f2c3caa84b7bdd26c018d4eddeeff Mon Sep 17 00:00:00 2001 From: Xavier Lowmiller Date: Mon, 6 Jun 2022 18:56:10 +0200 Subject: [PATCH 1/9] Fix tests --- .github/workflows/tests.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 03b3b77..2e4f935 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ on: branches: [ main ] jobs: - test-xcode-12: + test: env: DEVELOPER_DIR: /Applications/Xcode_12_beta.app/Contents/Developer @@ -18,17 +18,5 @@ jobs: - uses: actions/checkout@v2 - name: Generate Xcode Project run: swift package generate-xcodeproj - - name: Run Xcode 12 tests - run: xcodebuild test -scheme AppStorage-Package -destination 'platform=iOS Simulator,name=iPhone 11,OS=14.0' - - test-xcode-11: - env: - DEVELOPER_DIR: /Applications/Xcode_11.6.app/Contents/Developer - - - runs-on: macos-latest - - steps: - - uses: actions/checkout@v2 - - name: Run Xcode 11 tests + - name: Run Tests run: swift test From b7236964036b562197f1e33b9e3cda1d4c9511b4 Mon Sep 17 00:00:00 2001 From: Xavier Lowmiller Date: Mon, 6 Jun 2022 19:05:03 +0200 Subject: [PATCH 2/9] Enable Carthage release again --- .github/workflows/release.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0497eb9..5bdc4ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,8 +12,8 @@ jobs: steps: - uses: actions/checkout@v2 - # - name: Build Carthage Archive - # run: carthage build --archive --use-xcframeworks + - name: Build Carthage Archive + run: carthage build --archive --use-xcframeworks - name: Create Release id: create_release @@ -26,12 +26,12 @@ jobs: draft: false prerelease: false - # - name: Upload Release Asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} - # asset_path: ./AppStorage.framework.zip - # asset_name: AppStorage.framework.zip - # asset_content_type: application/zip + - name: Upload Release Asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./AppStorage.framework.zip + asset_name: AppStorage.framework.zip + asset_content_type: application/zip From b8da49d54ae194c475abc5cf9dfff800559f135a Mon Sep 17 00:00:00 2001 From: Xavier Lowmiller Date: Mon, 6 Jun 2022 19:05:46 +0200 Subject: [PATCH 3/9] [revert later] always run carthage script --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5bdc4ff..923e3a9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,8 @@ name: Release on: push: - tags: "*.*.*" + branches: "*" + # tags: "*.*.*" jobs: build: From 2878a544cd42c00acbc54174daf6cf1c365d0a54 Mon Sep 17 00:00:00 2001 From: Xavier Lowmiller Date: Mon, 6 Jun 2022 19:10:47 +0200 Subject: [PATCH 4/9] Remove generate-xcodeproj phase --- .github/workflows/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2e4f935..03513ee 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,5 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Generate Xcode Project - run: swift package generate-xcodeproj - name: Run Tests run: swift test From bd16078bea957b0347f7e83e42c4b182d73d63ae Mon Sep 17 00:00:00 2001 From: Xavier Lowmiller Date: Mon, 6 Jun 2022 19:12:34 +0200 Subject: [PATCH 5/9] Remove developer dir settings --- .github/workflows/tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 03513ee..60db728 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,9 +8,6 @@ on: jobs: test: - env: - DEVELOPER_DIR: /Applications/Xcode_12_beta.app/Contents/Developer - runs-on: macos-latest From 8046fe8f893b1dc720ec4b35b1cc2b7b2da17711 Mon Sep 17 00:00:00 2001 From: Xavier Lowmiller Date: Mon, 6 Jun 2022 23:35:22 +0200 Subject: [PATCH 6/9] Fix release? --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 923e3a9..39e9267 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,8 @@ jobs: - uses: actions/checkout@v2 - name: Build Carthage Archive - run: carthage build --archive --use-xcframeworks + run: carthage build --use-xcframeworks --no-skip-current + run: zip -r AppStorage-v${{ github.ref }}.xcframework.zip Carthage/Build - name: Create Release id: create_release From 1109bac90002ee3a196e591c1f96d1dae12ce7fc Mon Sep 17 00:00:00 2001 From: Xavier Lowmiller Date: Mon, 6 Jun 2022 23:36:51 +0200 Subject: [PATCH 7/9] Fix release? --- .github/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 39e9267..4131794 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,8 +14,9 @@ jobs: - uses: actions/checkout@v2 - name: Build Carthage Archive - run: carthage build --use-xcframeworks --no-skip-current - run: zip -r AppStorage-v${{ github.ref }}.xcframework.zip Carthage/Build + run: | + carthage build --use-xcframeworks --no-skip-current + zip -r AppStorage-v${{ github.ref }}.xcframework.zip Carthage/Build - name: Create Release id: create_release From aad55653ba0abfed63dc901482b82fdd44c461d0 Mon Sep 17 00:00:00 2001 From: Xavier Lowmiller Date: Mon, 6 Jun 2022 23:53:33 +0200 Subject: [PATCH 8/9] Fix release? --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4131794..11cad94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Build Carthage Archive run: | carthage build --use-xcframeworks --no-skip-current - zip -r AppStorage-v${{ github.ref }}.xcframework.zip Carthage/Build + zip -r AppStorage.xcframework.zip Carthage/Build - name: Create Release id: create_release From 69a6dcfc2e37a4cabe5b1a9a8fd5b2c51cf8d74e Mon Sep 17 00:00:00 2001 From: Xavier Lowmiller Date: Mon, 6 Jun 2022 23:57:55 +0200 Subject: [PATCH 9/9] Fix release? --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 11cad94..871aa44 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,6 +35,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./AppStorage.framework.zip - asset_name: AppStorage.framework.zip + asset_path: ./AppStorage.xcframework.zip + asset_name: AppStorage.xcframework.zip asset_content_type: application/zip