🔖 release v1.1.0

techouse · techouse · commit 8bfe45151c6a · 2024-02-03T15:16:00.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,9 +1,12 @@
 name: Build package
 
 on:
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+*'
+  workflow_call:
+    inputs:
+      runs-on:
+        description: 'The runner type'
+        required: true
+        type: string
 defaults:
   run:
     shell: bash
@@ -14,10 +17,8 @@ permissions: read-all
 jobs:
   publish:
     name: "Build"
-    runs-on: macos-latest
+    runs-on: "${{ inputs.runs-on }}"
     environment: build
-    permissions:
-      contents: write
     env:
       GITHUB_REPOSITORY_URL: ${{ github.server_url }}/${{ github.repository }}
     steps:
@@ -155,21 +156,24 @@ jobs:
         run: |
           set -e
           rm -rf ./build/dist/workflow.zip
-      - name: Create Alfred Workflow
-        id: create_alfred_workflow
+      - name: Compress artifacts
+        id: compress_artifacts
         env:
           WORKFLOW_NAME: ${{ vars.WORKFLOW_NAME }}
+        working-directory: build/dist
         run: |
           set -e
-          pushd ./build/dist || exit 1
-          find . -not -path "./*_cache*" -exec zip --symlinks "../${WORKFLOW_NAME}-v${VERSION}.alfredworkflow" {} +
-          popd || exit 1
-          echo "artifactPath=build/${WORKFLOW_NAME}-v${VERSION}.alfredworkflow" >> $GITHUB_ENV
-      - name: Release
-        id: release_workflow
-        uses: softprops/action-gh-release@v1
+          ARTIFACT_NAME=${WORKFLOW_NAME}-v${VERSION}-$(uname -m)
+          echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV
+          find . -not -path "./*_cache*" -exec zip --symlinks "../${ARTIFACT_NAME}.zip" {} +
+          echo "ARTIFACT_PATH=build/${ARTIFACT_NAME}.zip" >> $GITHUB_ENV
+      - name: Artifact
+        id: success_artifact
+        uses: actions/upload-artifact@v4
         with:
-          files: ${{ env.artifactPath }}
+          name: ${{ env.ARTIFACT_NAME }}
+          path: ${{ env.ARTIFACT_PATH }}
+          retention-days: 1
       - name: Clean up keychain and build directory
         id: clean_up
         if: ${{ always() }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,91 @@
+name: Release package
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
+defaults:
+  run:
+    shell: bash
+env:
+  PUB_ENVIRONMENT: bot.github
+permissions: read-all
+
+jobs:
+  build:
+    name: "Build"
+    strategy:
+      matrix:
+        os: [macos-14, macos-12]
+      fail-fast: true
+    uses: ./.github/workflows/build.yml
+    with:
+      runs-on: ${{ matrix.os }}
+    secrets: inherit
+  github_release:
+    name: "Github Release"
+    needs: build
+    environment: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Read pubspec.yaml version
+        id: read_pubspec_version
+        run: |
+          set -e
+          VERSION=$(yq -r '.version' pubspec.yaml)
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+      - name: Get arm64 artifact
+        id: download_arm64_artifact
+        uses: actions/download-artifact@v4
+        env:
+          WORKFLOW_NAME: ${{ vars.WORKFLOW_NAME }}
+          ARCH: arm64
+        with:
+          name: ${{ env.WORKFLOW_NAME }}-v${{ env.VERSION }}-${{ env.ARCH }}
+          path: ${{ runner.temp }}/download
+      - name: Get x86_64 artifact
+        id: download_x86_64_artifact
+        uses: actions/download-artifact@v4
+        env:
+          WORKFLOW_NAME: ${{ vars.WORKFLOW_NAME }}
+          ARCH: x86_64
+        with:
+          name: ${{ env.WORKFLOW_NAME }}-v${{ env.VERSION }}-${{ env.ARCH }}
+          path: ${{ runner.temp }}/download
+      - name: Unzip artifacts
+        env:
+          WORKFLOW_NAME: ${{ vars.WORKFLOW_NAME }}
+        id: unzip_artifacts
+        working-directory: ${{ runner.temp }}/download
+        run: |
+          set -e
+          for ARCH in "arm64" "x86_64"; do
+            mkdir -p $ARCH
+            unzip -q ${{ env.WORKFLOW_NAME }}-v${{ env.VERSION }}-${ARCH}.zip -d $ARCH
+          done
+      - name: Create Alfred Workflow
+        id: create_alfred_workflow
+        env:
+          WORKFLOW_NAME: ${{ vars.WORKFLOW_NAME }}
+        working-directory: ${{ runner.temp }}/download
+        run: |
+          set -e
+          mv x86_64/workflow arm64/workflow_intel
+          pushd arm64
+          find . -not -path "./*_cache*" -exec zip --symlinks "../${WORKFLOW_NAME}-v${VERSION}.alfredworkflow" {} +
+          popd
+      - name: Release
+        id: release_workflow
+        env:
+          WORKFLOW_NAME: ${{ vars.WORKFLOW_NAME }}
+        uses: softprops/action-gh-release@v1
+        with:
+          files: ${{ runner.temp }}/download/${{ env.WORKFLOW_NAME }}-v${{ env.VERSION }}.alfredworkflow
+      - name: Clean up
+        id: clean_up
+        if: ${{ always() }}
+        run: |
+          rm -rf $RUNNER_TEMP/download
diff --git a/info.plist b/info.plist
@@ -65,7 +65,7 @@
 				<key>escaping</key>
 				<integer>102</integer>
 				<key>script</key>
-				<string>arch -x86_64 ./workflow -u</string>
+				<string>[ "$(uname -m)" = "arm64" ] &amp;&amp; ./workflow -u || ./workflow_intel -u</string>
 				<key>scriptargtype</key>
 				<integer>1</integer>
 				<key>scriptfile</key>
@@ -108,7 +108,7 @@
 				<key>runningsubtext</key>
 				<string>Fetching StackOverflow questions ...</string>
 				<key>script</key>
-				<string>arch -x86_64 ./workflow -q "{query}"</string>
+				<string>[ "$(uname -m)" = "arm64" ] &amp;&amp; ./workflow -q "{query}" || ./workflow_intel -q "{query}"</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
diff --git a/pubspec.lock b/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "0f7b1783ddb1e4600580b8c00d0ddae5b06ae7f0382bd4fcce5db4df97b618e1"
+      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
       url: "https://pub.dev"
     source: hosted
-    version: "66.0.0"
+    version: "67.0.0"
   alfred_workflow:
     dependency: "direct main"
     description:
@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "5e8bdcda061d91da6b034d64d8e4026f355bcb8c3e7a0ac2da1523205a91a737"
+      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.0"
+    version: "6.4.1"
   args:
     dependency: "direct main"
     description:
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185
+      sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799"
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.11"
+    version: "7.3.0"
   built_collection:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,7 +4,7 @@ description: Search for answers on StackOverflow from Alfred
 # Prevent accidental publishing to pub.dev.
 publish_to: 'none'
 
-version: 1.0.7
+version: 1.1.0
 
 environment:
   sdk: '>=3.2.0 <4.0.0'
