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.

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

Fix CI by using Workbench devel #189

Merged
merged 4 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
CI:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ src/*/workbench.rs
src/*/target
src/*/*.gresource
src/*/*.gresource.xml
src/*/jsconfig.json
21 changes: 12 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,26 @@ SHELL:=/bin/bash -O globstar

setup:
flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
flatpak install --or-update --user --noninteractive flathub org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.node18//23.08 org.freedesktop.Sdk.Extension.typescript//23.08
# flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
flatpak install --or-update --user --noninteractive flathub re.sonny.Workbench org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08
flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
flatpak install --or-update --user --noninteractive gnome-nightly re.sonny.Workbench.Devel

format:
# npx prettier --write src/*/*.json
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench format javascript src/*/*.js
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench format css src/*/*.css
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench format python src/*/*.py
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench format rust src/*/*.rs
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench format blueprint src/*/*.blp
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench format vala src/*/*.vala
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format javascript src/*/*.js
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format css src/*/*.css
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format python src/*/*.py
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format rust src/*/*.rs
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format blueprint src/*/*.blp
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel format vala src/*/*.vala

test:
# list folders that have changed and run workbench-cli ci on them
git diff --dirstat=files,0 origin/main src | sed 's/^[ 0-9.]\+% //g' | uniq | xargs -d '\n' flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench ci
git diff --dirstat=files,0 origin/main src | sed 's/^[ 0-9.]\+% //g' | uniq | xargs -d '\n' flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel ci

all:
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench ci src/*
flatpak run --command="workbench-cli" --filesystem=host re.sonny.Workbench.Devel ci src/*

ci: setup test

Expand All @@ -35,6 +37,7 @@ clean:
rm -f src/*/Cargo.lockfile
rm -f src/*/lib.rs
rm -f src/*/workbench.rs
rm -f src/*/jsconfig.json
rm -f src/*/*.gresource
rm -f src/*/*.gresource.xml
rm -rf src/*/target
Expand Down
2 changes: 1 addition & 1 deletion src/Column View/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const Book = GObject.registerClass(
),
},
},
class Book extends GObject.Object {},
class Book extends GObject.Object { },
);

// Create the model
Expand Down
2 changes: 1 addition & 1 deletion src/Drop Down/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const KeyValuePair = GObject.registerClass(
),
},
},
class KeyValuePair extends GObject.Object {},
class KeyValuePair extends GObject.Object { },
);

const model = new Gio.ListStore({ item_type: KeyValuePair });
Expand Down
4 changes: 2 additions & 2 deletions src/Wallpaper/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ async function onClicked() {
parent,
uri,
Xdp.WallpaperFlags.PREVIEW |
Xdp.WallpaperFlags.BACKGROUND |
Xdp.WallpaperFlags.LOCKSCREEN,
Xdp.WallpaperFlags.BACKGROUND |
Xdp.WallpaperFlags.LOCKSCREEN,
null,
);

Expand Down
Loading