Skip to content

Commit

Permalink
automatic merge to finish v1.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
cars10 committed Apr 23, 2024
2 parents cfc3ff9 + a7354d6 commit 061722e
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 22 deletions.
36 changes: 19 additions & 17 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion browser_extension/chrome/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Elasticvue",
"version": "1.0.6",
"version": "1.0.7",
"description": "Elasticsearch frontend",
"manifest_version": 3,
"icons": {
Expand Down
2 changes: 1 addition & 1 deletion browser_extension/firefox/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Elasticvue",
"version": "1.0.6",
"version": "1.0.7",
"description": "Elasticsearch frontend",
"manifest_version": 2,
"icons": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "elasticvue",
"private": true,
"version": "1.0.6",
"version": "1.0.7",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"package": {
"productName": "elasticvue",
"version": "1.0.6"
"version": "1.0.7"
},
"build": {
"distDir": "../dist",
Expand Down

0 comments on commit 061722e

Please sign in to comment.