Skip to content

Commit

Permalink
chore: Update dependencies and fix clipboard image resizing
Browse files Browse the repository at this point in the history
  • Loading branch information
0-don committed Jul 4, 2024
1 parent 667490d commit 93eccf5
Show file tree
Hide file tree
Showing 8 changed files with 806 additions and 502 deletions.
85 changes: 45 additions & 40 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ jobs:
- name: install frontend dependencies
run: yarn install

- name: Set NO_STRIP environment variable
if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'macos-latest'
run: echo "NO_STRIP=true" >> $GITHUB_ENV


- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -118,47 +123,47 @@ jobs:
target: pkgbuild
pkgname: ${{ needs.setup.outputs.name_bin }}/

- name: copy deb package && create rpm.spec file (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
run: |
mkdir -p ${{ needs.setup.outputs.name_bin }}
cp -fr ${{ needs.setup.outputs.deb_pkg_path }}/${{ needs.setup.outputs.deb_pkg_name }} ${{ needs.setup.outputs.name_bin }}/${{ needs.setup.outputs.deb_pkg_renamed }}
cat <<EOF > ./${{ needs.setup.outputs.name_bin }}/rpm.spec
Name: ${{ needs.setup.outputs.name }}
Version: ${{ needs.setup.outputs.version }}
BuildArch: ${{ env.ARCH }}
Release: 1
Summary: ${{ needs.setup.outputs.description }}
Requires: ${{ env.DEPENDENCIES_RPM }}
License: ${{ needs.setup.outputs.license }}
Source0: ${{ needs.setup.outputs.deb_pkg_renamed }}
%description
${{ needs.setup.outputs.description }}
%prep
ar x %{SOURCE0}
%build
rm -rf control.tar.gz
tar xvf data.tar.gz
# - name: copy deb package && create rpm.spec file (ubuntu only)
# if: matrix.platform == 'ubuntu-latest'
# run: |
# mkdir -p ${{ needs.setup.outputs.name_bin }}
# cp -fr ${{ needs.setup.outputs.deb_pkg_path }}/${{ needs.setup.outputs.deb_pkg_name }} ${{ needs.setup.outputs.name_bin }}/${{ needs.setup.outputs.deb_pkg_renamed }}
# cat <<EOF > ./${{ needs.setup.outputs.name_bin }}/rpm.spec
# Name: ${{ needs.setup.outputs.name }}
# Version: ${{ needs.setup.outputs.version }}
# BuildArch: ${{ env.ARCH }}
# Release: 1
# Summary: ${{ needs.setup.outputs.description }}
# Requires: ${{ env.DEPENDENCIES_RPM }}
# License: ${{ needs.setup.outputs.license }}
# Source0: ${{ needs.setup.outputs.deb_pkg_renamed }}

# %description
# ${{ needs.setup.outputs.description }}

# %prep
# ar x %{SOURCE0}

# %build
# rm -rf control.tar.gz
# tar xvf data.tar.gz

%install
cp -fr usr/ %{buildroot}
%files
%{_bindir}/${{ needs.setup.outputs.name }}
/usr/share/applications/${{ needs.setup.outputs.name }}.desktop
/usr/share/icons/hicolor/**/*
EOF
cat ${{ needs.setup.outputs.name_bin }}/rpm.spec
- name: createa rpm package (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
uses: Antikythera/build-rpm@latest
with:
spec_file: ${{ needs.setup.outputs.name_bin }}/rpm.spec
sources: ${{ needs.setup.outputs.name_bin }}/${{ needs.setup.outputs.deb_pkg_renamed }}
# %install
# cp -fr usr/ %{buildroot}

# %files
# %{_bindir}/${{ needs.setup.outputs.name }}
# /usr/share/applications/${{ needs.setup.outputs.name }}.desktop
# /usr/share/icons/hicolor/**/*
# EOF
# cat ${{ needs.setup.outputs.name_bin }}/rpm.spec

# - name: createa rpm package (ubuntu only)
# if: matrix.platform == 'ubuntu-latest'
# uses: Antikythera/build-rpm@latest
# with:
# spec_file: ${{ needs.setup.outputs.name_bin }}/rpm.spec
# sources: ${{ needs.setup.outputs.name_bin }}/${{ needs.setup.outputs.deb_pkg_renamed }}

- name: upload arch && rpm release (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ pnpm-lock.yaml
target
yarn-error.log
.vscode
bun.lockb
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clippy",
"version": "1.2.8",
"version": "1.2.9",
"description": "Clipboard Manager built with Rust & Typescript",
"license": "MIT",
"type": "module",
Expand All @@ -9,27 +9,28 @@
"start": "vite",
"dev": "vite",
"build": "vite build",
"tauri": "tauri",
"tauri": "cross-env NO_STRIP=true tauri",
"d": "tauri dev",
"gen": "sea-orm-cli migrate refresh -v -d src-tauri/migration && sea-orm-cli generate entity -l -o src-tauri/entity/src --expanded-format --with-serde both",
"icon": "tauri icon"
},
"dependencies": {
"@tauri-apps/api": "^1.5.4",
"@tauri-apps/api": "^1.6.0",
"dayjs": "^1.11.11",
"solid-icons": "^1.1.0",
"solid-js": "^1.8.17"
"solid-js": "^1.8.18"
},
"devDependencies": {
"@tauri-apps/cli": "^1.5.12",
"@tauri-apps/cli": "^1.6.0",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.14",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.5",
"vite": "^5.2.11",
"vite-plugin-checker": "^0.6.4",
"vite-plugin-solid": "^2.10.2"
"postcss": "^8.4.39",
"prettier": "^3.3.2",
"prettier-plugin-tailwindcss": "^0.6.5",
"tailwindcss": "^3.4.4",
"typescript": "^5.5.3",
"vite": "^5.3.3",
"vite-plugin-checker": "^0.7.0",
"vite-plugin-solid": "^2.10.2",
"cross-env": "^7.0.3"
}
}
Loading

0 comments on commit 93eccf5

Please sign in to comment.