From 122f2e3616cbb92e2843fc9ada43892bc387d62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Tue, 23 Apr 2024 21:26:09 +0200 Subject: [PATCH 1/2] maybe fix building macos --- .github/workflows/release.yml | 36 ++++++++++++++++++----------------- .github/workflows/test.yml | 2 +- CHANGELOG.md | 5 +++++ 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9159a59d..94bf9228 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,9 +25,9 @@ jobs: APPLE_TEAM_ID: "${{ secrets.APPLE_TEAM_ID }}" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: '20' cache: 'yarn' @@ -36,10 +36,8 @@ jobs: - run: rustup toolchain install stable - run: rustup target add aarch64-apple-darwin if: matrix.platform == 'macos-latest' - - uses: swatinem/rust-cache@v2 - with: - workspaces: './src-tauri -> target' - key: ${{ matrix.platform }} + - run: rustup target add x86_64-apple-darwin + if: matrix.platform == 'macos-latest' - name: (linux) install dependencies if: matrix.platform == 'ubuntu-latest' @@ -48,12 +46,12 @@ jobs: sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 librsvg2-dev patchelf - name: build apple-silicon app - if: matrix.platform == 'macos-latest' run: yarn tauri:build --target aarch64-apple-darwin + if: matrix.platform == 'macos-latest' - name: (mac arm) upload .dmg if: matrix.platform == 'macos-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/elasticvue_*_aarch64.dmg @@ -65,15 +63,19 @@ jobs: - name: (mac arm) upload .app and artifacts if: matrix.platform == 'macos-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_aarch64* - run: yarn tauri:build + if: matrix.platform != 'macos-latest' + + - run: yarn tauri:build --target x86_64-apple-darwin + if: matrix.platform == 'macos-latest' - name: (mac) upload .dmg if: matrix.platform == 'macos-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: src-tauri/target/release/bundle/dmg/elasticvue_*_x64.dmg @@ -85,38 +87,38 @@ jobs: - name: (mac) upload .app and artifacts if: matrix.platform == 'macos-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: src-tauri/target/release/bundle/macos/elasticvue_x64* - name: (linux) upload .deb if: matrix.platform == 'ubuntu-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: src-tauri/target/release/bundle/deb/elasticvue_*_amd64.deb - name: (linux) upload .appimage if: matrix.platform == 'ubuntu-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: src-tauri/target/release/bundle/appimage/elasticvue_*_amd64.* - name: (linux) upload binary id: linux_upload_binary if: matrix.platform == 'ubuntu-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: src-tauri/target/release/elasticvue - name: (windows) upload .msi if: matrix.platform == 'windows-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: src-tauri/target/release/bundle/msi/elasticvue_*_x64* - name: (windows) upload .exe if: matrix.platform == 'windows-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: src-tauri/target/release/elasticvue.exe @@ -130,7 +132,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 702b2a83..c0a7fd44 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,6 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: run tests run: make CI=1 ci diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ed9f613..c80b50b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.0.7 + +This release contains no changes to elasticvue itself. It is only done to fix build issues with the macos desktop +version. + ## 1.0.6 * double click to edit search results, fixes [#225](https://github.com/cars10/elasticvue/issues/225) From a7354d65f75797131fdea34ad907e7a9171afda6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20K=C3=B6nig?= Date: Tue, 23 Apr 2024 21:26:28 +0200 Subject: [PATCH 2/2] bumps version to 1.0.7 --- browser_extension/chrome/manifest.json | 2 +- browser_extension/firefox/manifest.json | 2 +- package.json | 2 +- src-tauri/tauri.conf.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser_extension/chrome/manifest.json b/browser_extension/chrome/manifest.json index 9d8bf2c6..8ce13c3e 100644 --- a/browser_extension/chrome/manifest.json +++ b/browser_extension/chrome/manifest.json @@ -1,6 +1,6 @@ { "name": "Elasticvue", - "version": "1.0.6", + "version": "1.0.7", "description": "Elasticsearch frontend", "manifest_version": 3, "icons": { diff --git a/browser_extension/firefox/manifest.json b/browser_extension/firefox/manifest.json index 2f26fa18..459e6ae5 100644 --- a/browser_extension/firefox/manifest.json +++ b/browser_extension/firefox/manifest.json @@ -1,6 +1,6 @@ { "name": "Elasticvue", - "version": "1.0.6", + "version": "1.0.7", "description": "Elasticsearch frontend", "manifest_version": 2, "icons": { diff --git a/package.json b/package.json index 80f0542b..c10d2c63 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "elasticvue", "private": true, - "version": "1.0.6", + "version": "1.0.7", "scripts": { "dev": "vite", "build": "vite build", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 30263b83..027aab70 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "elasticvue", - "version": "1.0.6" + "version": "1.0.7" }, "build": { "distDir": "../dist",