From d943888e5b188e6512e3756174238272d83aea31 Mon Sep 17 00:00:00 2001 From: KAWASHIMA Yoshiyuki Date: Thu, 26 Dec 2024 23:08:48 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Revert=20"Test=20action=20=E3=81=AE=20Resul?= =?UTF-8?q?t=20Bundle=20Path=20=E3=81=AB=E6=8B=A1=E5=BC=B5=E5=AD=90?= =?UTF-8?q?=E3=82=92=E6=98=8E=E8=A8=98=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 03eeb8e338a2fc3d1b725ba1b10cc09367811607. --- .github/workflows/test.yml | 2 +- .gitignore | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7add9e9..2fb6766 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,7 +39,7 @@ jobs: device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"` cd ${{ matrix.config.dir }} rm -rf "${{ matrix.config.scheme }}".xcresult - xcodebuild -scheme "${{ matrix.config.scheme }}" -resultBundlePath "${{ matrix.config.scheme }}".xcresult test -destination "platform=$platform,name=$device" + xcodebuild -scheme "${{ matrix.config.scheme }}" -resultBundlePath ${{ matrix.config.scheme }} test -destination "platform=$platform,name=$device" - name: Report uses: kishikawakatsumi/xcresulttool@v1 with: diff --git a/.gitignore b/.gitignore index 48642dd..be1bf4d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,7 @@ xcuserdata/ DerivedData/ docs -/Example.xcresult # Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata # hence it is not needed unless you have added a package configuration file to your project -.swiftpm +.swiftpm \ No newline at end of file From 7ba046a202ffc78422a66e2c29426637c51a8b6d Mon Sep 17 00:00:00 2001 From: KAWASHIMA Yoshiyuki Date: Thu, 26 Dec 2024 23:08:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"xcresult=20=E3=81=8C=E6=AE=8B?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB?= =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit cccf662f1df162eb5f856a42d08e34af91c9203a. --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2fb6766..8da6fb4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,7 +38,6 @@ jobs: # xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959) device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"` cd ${{ matrix.config.dir }} - rm -rf "${{ matrix.config.scheme }}".xcresult xcodebuild -scheme "${{ matrix.config.scheme }}" -resultBundlePath ${{ matrix.config.scheme }} test -destination "platform=$platform,name=$device" - name: Report uses: kishikawakatsumi/xcresulttool@v1 From 738d10dd718f81c3eb4a6014a854784ecccd2fae Mon Sep 17 00:00:00 2001 From: KAWASHIMA Yoshiyuki Date: Thu, 26 Dec 2024 23:09:33 +0900 Subject: [PATCH 3/3] Revert "Merge pull request #86 from yumemi-inc/feature/matrix_test" This reverts commit 5172b0de20b3332dac1ac81cf1c4ed1eab4cfcda, reversing changes made to 2b29eb4bc05b844cdeda3034de5c301bfcab173c. --- .github/workflows/test.yml | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8da6fb4..7d6a350 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,45 +2,32 @@ name: Test on: push: - branches: ["main"] + branches: [ "main" ] pull_request_target: - branches: ["main"] + branches: [ "main" ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: jobs: - setup: - runs-on: ubuntu-latest - outputs: - matrix: ${{ steps.setmatrix.outputs.matrix }} - steps: - - id: setmatrix - run: | - object="[{\"scheme\":\"YumemiWeather\",\"dir\":\".\"},{\"scheme\":\"Example\",\"dir\":\"Example\"}]" - echo "matrix=$object" >> $GITHUB_OUTPUT - test: - needs: setup + build: runs-on: macos-latest permissions: contents: read checks: write - strategy: - matrix: - config: ${{fromJson(needs.setup.outputs.matrix)}} steps: - name: Checkout uses: actions/checkout@v4 - name: Test env: + scheme: ${{ 'YumemiWeather' }} platform: ${{ 'iOS Simulator' }} run: | # xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959) device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"` - cd ${{ matrix.config.dir }} - xcodebuild -scheme "${{ matrix.config.scheme }}" -resultBundlePath ${{ matrix.config.scheme }} test -destination "platform=$platform,name=$device" - - name: Report + xcodebuild -scheme "$scheme" -resultBundlePath TestResults test -destination "platform=$platform,name=$device" + - name: Format uses: kishikawakatsumi/xcresulttool@v1 with: - path: ${{ matrix.config.scheme }}.xcresult + path: TestResults.xcresult if: success() || failure()