Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: rename "lib" to "repository" #131

Merged
merged 2 commits into from
Jan 30, 2024
Merged

refactor: rename "lib" to "repository" #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ecfc46
refactor: rename "lib" to "repository"
liias Jan 30, 2024
ced5d40
minor settings ui improvement
liias Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,21 @@ jobs:
export APPCAST_SECRET_KEY_FILE="${GITHUB_WORKSPACE}/secrets/appcast_seckey"
./build-linux.sh
shell: bash
- name: Test installer
run: |
# desktop-file-utils is required for running install.sh (desktop-file-install and update-desktop-database)
sudo apt-get install -y --no-install-recommends desktop-file-utils
target_dir='target/universal-unknown-linux-gnu/release'
cd "$target_dir"
set -x
./install.sh
shell: bash
#- name: End-to-end test - run Browsers
# run: |
# install_dir="$HOME/.local/bin"
# cd "$install_dir"
# ./browsers --no-gui https://browsers.software
# shell: bash
- name: Upload release artifact
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -171,6 +186,22 @@ jobs:
echo "1. P12_FILE=$P12_FILE"
./build-mac.sh
shell: bash
- name: Test app dir
run: |
target_dir='target/universal-apple-darwin/release'
cd "$target_dir"
cd "./Browsers.app/"
set -x
ls -altrh .
ls -altrh ./Contents/Resources/
shell: bash
- name: End-to-end test - run Browsers
run: |
target_dir='target/universal-apple-darwin/release'
cd "$target_dir"
set -x
open ./Browsers.app -u https://browsers.software --stdout /tmp/my-stdout --args --no-gui && cat /tmp/my-stdout
shell: bash
- name: Upload mac artifacts
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -236,6 +267,13 @@ jobs:
export APPCAST_SECRET_KEY_FILE="${GITHUB_WORKSPACE}/secrets/appcast_seckey"
./build-windows.sh
shell: bash
- name: Test installer
run: |
target_dir='target/universal-pc-windows-msvc/release'
cd "$target_dir"
set -x
./install.bat --silent
shell: bash
- name: Upload release artifact
uses: actions/upload-artifact@v4
with:
Expand Down
71 changes: 38 additions & 33 deletions build-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,37 @@ build_binary() {
}

build_app_bundle() {
mkdir -p "$target_dir/icons/"
mkdir -p "$target_dir/icons/16x16"
mkdir -p "$target_dir/icons/32x32"
mkdir -p "$target_dir/icons/64x64"
mkdir -p "$target_dir/icons/128x128"
mkdir -p "$target_dir/icons/256x256"
mkdir -p "$target_dir/icons/512x512"
mkdir -p "$target_dir/i18n"
mkdir -p "$target_dir/i18n/en-US"
mkdir -p "$target_dir/lib"

mkdir -p "$target_dir/xfce4/helpers"

cp "resources/icons/16x16/software.Browsers.png" "$target_dir/icons/16x16/software.Browsers.png"
cp "resources/icons/32x32/software.Browsers.png" "$target_dir/icons/32x32/software.Browsers.png"
cp "resources/icons/64x64/software.Browsers.png" "$target_dir/icons/64x64/software.Browsers.png"
cp "resources/icons/128x128/software.Browsers.png" "$target_dir/icons/128x128/software.Browsers.png"
cp "resources/icons/256x256/software.Browsers.png" "$target_dir/icons/256x256/software.Browsers.png"
cp "resources/icons/512x512/software.Browsers.png" "$target_dir/icons/512x512/software.Browsers.png"
cp "resources/i18n/en-US/builtin.ftl" "$target_dir/i18n/en-US/builtin.ftl"
cp "resources/lib/application-repository.toml" "$target_dir/lib/application-repository.toml"
mkdir -p "$target_dir/resources/"
mkdir -p "$target_dir/resources/icons/"
mkdir -p "$target_dir/resources/icons/16x16/"
mkdir -p "$target_dir/resources/icons/32x32/"
mkdir -p "$target_dir/resources/icons/64x64/"
mkdir -p "$target_dir/resources/icons/128x128/"
mkdir -p "$target_dir/resources/icons/256x256/"
mkdir -p "$target_dir/resources/icons/512x512/"
mkdir -p "$target_dir/resources/i18n/"
mkdir -p "$target_dir/resources/i18n/en-US/"
mkdir -p "$target_dir/resources/repository/"

mkdir -p "$target_dir/template/"
mkdir -p "$target_dir/template/share/"
mkdir -p "$target_dir/template/share/applications/"
mkdir -p "$target_dir/template/share/xfce4/"
mkdir -p "$target_dir/template/share/xfce4/helpers/"

cp "resources/icons/16x16/software.Browsers.png" "$target_dir/resources/icons/16x16/software.Browsers.png"
cp "resources/icons/32x32/software.Browsers.png" "$target_dir/resources/icons/32x32/software.Browsers.png"
cp "resources/icons/64x64/software.Browsers.png" "$target_dir/resources/icons/64x64/software.Browsers.png"
cp "resources/icons/128x128/software.Browsers.png" "$target_dir/resources/icons/128x128/software.Browsers.png"
cp "resources/icons/256x256/software.Browsers.png" "$target_dir/resources/icons/256x256/software.Browsers.png"
cp "resources/icons/512x512/software.Browsers.png" "$target_dir/resources/icons/512x512/software.Browsers.png"
cp "resources/i18n/en-US/builtin.ftl" "$target_dir/resources/i18n/en-US/builtin.ftl"
cp "resources/repository/application-repository.toml" "$target_dir/resources/repository/application-repository.toml"

cp "extra/linux/dist/install.sh" "$target_dir/install.sh"
cp "extra/linux/dist/uninstall.sh" "$target_dir/uninstall.sh"
cp "extra/linux/dist/software.Browsers.template.desktop" "$target_dir/software.Browsers.template.desktop"
cp "extra/linux/dist/xfce4/helpers/software.Browsers.template.desktop" "$target_dir/xfce4/helpers/software.Browsers.template.desktop"
cp "extra/linux/dist/software.Browsers.template.desktop" "$target_dir/template/share/applications/software.Browsers.template.desktop"
cp "extra/linux/dist/xfce4/helpers/software.Browsers.template.desktop" "$target_dir/template/share/xfce4/helpers/software.Browsers.template.desktop"
}

make_archives() {
Expand All @@ -66,16 +71,16 @@ make_archives() {
'./x86_64/browsers'
'./aarch64/browsers'
'./armv7l/browsers'
'./icons/16x16/software.Browsers.png'
'./icons/32x32/software.Browsers.png'
'./icons/64x64/software.Browsers.png'
'./icons/128x128/software.Browsers.png'
'./icons/256x256/software.Browsers.png'
'./icons/512x512/software.Browsers.png'
'./software.Browsers.template.desktop'
'./xfce4/helpers/software.Browsers.template.desktop'
'./i18n/en-US/builtin.ftl'
'./lib/application-repository.toml'
'./resources/i18n/en-US/builtin.ftl'
'./resources/icons/16x16/software.Browsers.png'
'./resources/icons/32x32/software.Browsers.png'
'./resources/icons/64x64/software.Browsers.png'
'./resources/icons/128x128/software.Browsers.png'
'./resources/icons/256x256/software.Browsers.png'
'./resources/icons/512x512/software.Browsers.png'
'./resources/repository/application-repository.toml'
'./template/share/applications/software.Browsers.template.desktop'
'./template/share/xfce4/helpers/software.Browsers.template.desktop'
'./install.sh'
'./uninstall.sh'
)
Expand Down
4 changes: 2 additions & 2 deletions build-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ build_app_bundle() {
mkdir -p "$target_dir/Browsers.app/Contents/Resources/i18n/en-US"
mkdir -p "$target_dir/Browsers.app/Contents/Resources/icons"
mkdir -p "$target_dir/Browsers.app/Contents/Resources/icons/512x512"
mkdir -p "$target_dir/Browsers.app/Contents/Resources/lib"
mkdir -p "$target_dir/Browsers.app/Contents/Resources/repository"
# FYI: extra/macos/Info.plist is copied
# to target/universal-apple-darwin/meta/Info.plist
# by build.rs (because it also sets version from Cargo.toml)
cp target/universal-apple-darwin/meta/Info.plist target/universal-apple-darwin/release/Browsers.app/Contents/Info.plist
cp extra/macos/icons/Browsers.icns "$target_dir/Browsers.app/Contents/Resources/Browsers.icns"
cp resources/icons/512x512/software.Browsers.png "$target_dir/Browsers.app/Contents/Resources/icons/512x512/software.Browsers.png"
cp resources/i18n/en-US/builtin.ftl "$target_dir/Browsers.app/Contents/Resources/i18n/en-US/builtin.ftl"
cp resources/lib/application-repository.toml "$target_dir/Browsers.app/Contents/Resources/lib/application-repository.toml"
cp resources/repository/application-repository.toml "$target_dir/Browsers.app/Contents/Resources/repository/application-repository.toml"
cp target/universal-apple-darwin/release/Browsers "$target_dir/Browsers.app/Contents/MacOS/Browsers"
}

Expand Down
52 changes: 26 additions & 26 deletions build-windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,29 @@ build_binary() {
}

build_app_bundle() {
mkdir -p "$target_dir/icons/"
mkdir -p "$target_dir/icons/16x16"
mkdir -p "$target_dir/icons/32x32"
mkdir -p "$target_dir/icons/64x64"
mkdir -p "$target_dir/icons/128x128"
mkdir -p "$target_dir/icons/256x256"
mkdir -p "$target_dir/icons/512x512"
mkdir -p "$target_dir/i18n"
mkdir -p "$target_dir/i18n/en-US"
mkdir -p "$target_dir/lib"
mkdir -p "$target_dir/resources/icons/"
mkdir -p "$target_dir/resources/icons/16x16"
mkdir -p "$target_dir/resources/icons/32x32"
mkdir -p "$target_dir/resources/icons/64x64"
mkdir -p "$target_dir/resources/icons/128x128"
mkdir -p "$target_dir/resources/icons/256x256"
mkdir -p "$target_dir/resources/icons/512x512"
mkdir -p "$target_dir/resources/i18n"
mkdir -p "$target_dir/resources/i18n/en-US"
mkdir -p "$target_dir/resources/repository"

mkdir -p "$target_dir/startmenu"
mkdir -p "$target_dir/startmenu/user"
mkdir -p "$target_dir/startmenu/system"

cp "resources/icons/16x16/software.Browsers.png" "$target_dir/icons/16x16/software.Browsers.png"
cp "resources/icons/32x32/software.Browsers.png" "$target_dir/icons/32x32/software.Browsers.png"
cp "resources/icons/64x64/software.Browsers.png" "$target_dir/icons/64x64/software.Browsers.png"
cp "resources/icons/128x128/software.Browsers.png" "$target_dir/icons/128x128/software.Browsers.png"
cp "resources/icons/256x256/software.Browsers.png" "$target_dir/icons/256x256/software.Browsers.png"
cp "resources/icons/512x512/software.Browsers.png" "$target_dir/icons/512x512/software.Browsers.png"
cp "resources/i18n/en-US/builtin.ftl" "$target_dir/i18n/en-US/builtin.ftl"
cp "resources/lib/application-repository.toml" "$target_dir/lib/application-repository.toml"
cp "resources/icons/16x16/software.Browsers.png" "$target_dir/resources/icons/16x16/software.Browsers.png"
cp "resources/icons/32x32/software.Browsers.png" "$target_dir/resources/icons/32x32/software.Browsers.png"
cp "resources/icons/64x64/software.Browsers.png" "$target_dir/resources/icons/64x64/software.Browsers.png"
cp "resources/icons/128x128/software.Browsers.png" "$target_dir/resources/icons/128x128/software.Browsers.png"
cp "resources/icons/256x256/software.Browsers.png" "$target_dir/resources/icons/256x256/software.Browsers.png"
cp "resources/icons/512x512/software.Browsers.png" "$target_dir/resources/icons/512x512/software.Browsers.png"
cp "resources/i18n/en-US/builtin.ftl" "$target_dir/resources/i18n/en-US/builtin.ftl"
cp "resources/repository/application-repository.toml" "$target_dir/resources/repository/application-repository.toml"

cp "extra/windows/dist/install.bat" "$target_dir/install.bat"
cp "extra/windows/dist/uninstall.bat" "$target_dir/uninstall.bat"
Expand All @@ -70,14 +70,14 @@ make_archives() {
local filelist=(
'./x86_64/browsers.exe'
'./aarch64/browsers.exe'
'./icons/16x16/software.Browsers.png'
'./icons/32x32/software.Browsers.png'
'./icons/64x64/software.Browsers.png'
'./icons/128x128/software.Browsers.png'
'./icons/256x256/software.Browsers.png'
'./icons/512x512/software.Browsers.png'
'./i18n/en-US/builtin.ftl'
'./lib/application-repository.toml'
'./resources/icons/16x16/software.Browsers.png'
'./resources/icons/32x32/software.Browsers.png'
'./resources/icons/64x64/software.Browsers.png'
'./resources/icons/128x128/software.Browsers.png'
'./resources/icons/256x256/software.Browsers.png'
'./resources/icons/512x512/software.Browsers.png'
'./resources/i18n/en-US/builtin.ftl'
'./resources/repository/application-repository.toml'
'./install.bat'
'./uninstall.bat'
'./announce_default.ps1'
Expand Down
Loading