Skip to content

Commit

Permalink
chore: cleanup unnecessary scripts and files (#10731)
Browse files Browse the repository at this point in the history
* chore: cleanup unnecessary scripts and files

- Removed `.cargo/config` and `__TAURI_WORKSPACE__` workaround
- Removed husky and precommit hooks
- Remove unecessary script files
- Moved `.scripts/covector/sync-cli-metadata.js` to `.scripts/ci/sync-cli-metadata.js`
- Moved `app-icon.png` to `.github/icon.png`
- Enhanced has-diff.sh script to output which files are modified

* lock file

* bring back __TAURI_WORKSPACE__

* add change file

---------

Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
  • Loading branch information
amrbashir and lucasfernog authored Aug 22, 2024
1 parent 1add13b commit f4d5241
Show file tree
Hide file tree
Showing 44 changed files with 74 additions and 345 deletions.
2 changes: 2 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
[env]
# workaround needed to prevent `STATUS_ENTRYPOINT_NOT_FOUND` error
# see https://github.com/tauri-apps/tauri/pull/4383#issuecomment-1212221864
__TAURI_WORKSPACE__ = "true"
8 changes: 4 additions & 4 deletions .changes/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,14 @@
"path": "./core/tauri-plugin",
"manager": "rust",
"dependencies": ["tauri-utils"],
"postversion": "node ../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }"
"postversion": "node ../../.scripts/ci/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }"
},
"tauri-build": {
"path": "./core/tauri-build",
"manager": "rust",
"dependencies": ["tauri-codegen", "tauri-utils"],
"postversion": [
"node ../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }",
"node ../../.scripts/ci/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }",
"cargo build --manifest-path ../tauri-config-schema/Cargo.toml"
],
"assets": [
Expand All @@ -212,14 +212,14 @@
"tauri-runtime-wry",
"tauri-build"
],
"postversion": "node ../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }"
"postversion": "node ../../.scripts/ci/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }"
},
"@tauri-apps/cli": {
"path": "./tooling/cli/node",
"manager": "javascript",
"dependencies": ["tauri-cli"],
"postversion": [
"node ../../../.scripts/covector/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }",
"node ../../../.scripts/ci/sync-cli-metadata.js ${ pkg.pkg } ${ release.type }",
"cargo build --manifest-path ../../../core/tauri-config-schema/Cargo.toml"
],
"prepublish": [],
Expand Down
17 changes: 17 additions & 0 deletions .changes/update-docs-icon-path.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
"tauri": patch:changes
"tauri-runtime": patch:changes
"tauri-runtime-wry": patch:changes
"tauri-utils": patch:changes
"tauri-macros": patch:changes
"tauri-codegen": patch:changes
"tauri-build": patch:changes
"tauri-plugin": patch:changes
"tauri-driver": patch:changes
"tauri-cli": patch:changes
"@tauri-apps/cli": patch:changes
"@tauri-apps/api": patch:changes
"tauri-bundler": patch:changes
---

Update documentation icon path.
File renamed without changes
24 changes: 0 additions & 24 deletions .husky/pre-commit

This file was deleted.

55 changes: 0 additions & 55 deletions .scripts/cargo-check.ps1

This file was deleted.

45 changes: 0 additions & 45 deletions .scripts/cargo-check.sh

This file was deleted.

8 changes: 5 additions & 3 deletions .scripts/ci/has-diff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-License-Identifier: MIT

if git diff --quiet --ignore-submodules HEAD
git_output=$(git diff --ignore-submodules --name-only HEAD)
if [ -z "$git_output" ];
then
echo "working directory is clean"
echo "working directory is clean"
else
echo "found diff"
echo "✘ found diff:"
echo "$git_output"
exit 1
fi
File renamed without changes.
7 changes: 0 additions & 7 deletions .scripts/docker/build.sh

This file was deleted.

30 changes: 0 additions & 30 deletions .scripts/setup.ps1

This file was deleted.

29 changes: 0 additions & 29 deletions .scripts/setup.sh

This file was deleted.

24 changes: 0 additions & 24 deletions .scripts/update-lockfiles.sh

This file was deleted.

66 changes: 0 additions & 66 deletions .scripts/utils/batch_to_exe.cmd

This file was deleted.

4 changes: 2 additions & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"recommendations": [
"ms-vscode-remote.vscode-remote-extensionpack",
"EditorConfig.EditorConfig",
"esbenp.prettier-vscode"
"esbenp.prettier-vscode",
"rust-lang.rust-analyzer",
]
}
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ members = [
]

exclude = [
# examples that can be compiled with the tauri CLI
# examples that need to be compiled with the tauri CLI
"examples/api/src-tauri",
"examples/resources/src-tauri",
"examples/web/core",
Expand Down
4 changes: 2 additions & 2 deletions core/tauri-acl-schema/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//! Hosts the schema for the Tauri configuration file.

#![doc(
html_logo_url = "https://github.com/tauri-apps/tauri/raw/dev/app-icon.png",
html_favicon_url = "https://github.com/tauri-apps/tauri/raw/dev/app-icon.png"
html_logo_url = "https://github.com/tauri-apps/tauri/raw/dev/.github/icon.png",
html_favicon_url = "https://github.com/tauri-apps/tauri/raw/dev/.github/icon.png"
)]

fn main() {}
2 changes: 1 addition & 1 deletion core/tauri-build/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tauri-build

<img align="right" src="https://github.com/tauri-apps/tauri/raw/dev/app-icon.png" height="128" width="128">
<img align="right" src="https://github.com/tauri-apps/tauri/raw/dev/.github/icon.png" height="128" width="128">

[![status](https://img.shields.io/badge/status-stable-blue.svg)](https://github.com/tauri-apps/tauri/tree/dev)
[![License](https://img.shields.io/badge/License-MIT%20or%20Apache%202-green.svg)](https://opencollective.com/tauri)
Expand Down
Loading

0 comments on commit f4d5241

Please sign in to comment.