Skip to content
This repository was archived by the owner on Jun 2, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: catppuccin/gtk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.2
Choose a base ref
...
head repository: catppuccin/gtk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.0.3
Choose a head ref
  • 3 commits
  • 40 files changed
  • 4 contributors

Commits on May 27, 2024

  1. docs(README): hardcode version in more places (#256) 

    As we make use of release-please, I feel like it's
nicer to hardcode the versions as they will
automatically get updated upon release.
    @sgoudham
    sgoudham authored May 27, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    54633c0 View commit details

Commits on Jun 1, 2024

  1. perf: improving performance, layout (#215) 

    Co-authored-by: nullishamy <git@amyerskine.me>
    @iruzo @nullishamy
    iruzo and nullishamy authored Jun 1, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    cadc3e2 View commit details

  2. chore(main): release 1.0.3 (#263) 

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    @github-actions
    github-actions[bot] authored Jun 1, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    3cb2f3a View commit details
Showing with 1,039 additions and 681 deletions.
  1. +41 −10 .github/workflows/build.yml
  2. +27 −0 .github/workflows/docker.yml
  3. +24 −6 .github/workflows/release.yml
  4. +3 −0 .gitignore
  5. +1 −1 .gitmodules
  6. +1 −1 .release-please-manifest.json
  7. +3 −10 CHANGELOG.md
  8. +4 −4 README.md
  9. +17 −631 build.py
  10. +14 −0 docker/Dockerfile
  11. +83 −0 docker/build.sh
  12. +66 −0 docker/push.sh
  13. 0 { → docs}/ARCHITECTURE.md
  14. +15 −0 docs/CHANGELOG.md
  15. +19 −7 { → docs}/CONTRIBUTING.md
  16. +9 −3 install.py
  17. +1 −0 shell.nix
  18. +74 −0 sources/build/__init__.py
  19. +100 −0 sources/build/args.py
  20. +69 −0 sources/build/context.py
  21. +9 −0 sources/build/logger.py
  22. +35 −0 sources/build/patches.py
  23. +390 −0 sources/build/theme.py
  24. +23 −0 sources/build/utils.py
  25. 0 { → sources}/colloid
  26. 0 {patches/colloid/fixes → sources/patches/colloid}/alt-tab-background-color.patch
  27. 0 { → sources}/patches/colloid/palette.tera
  28. 0 { → sources}/patches/colloid/plank-dark.patch
  29. 0 { → sources}/patches/colloid/plank-light.patch
  30. 0 { → sources}/patches/colloid/sass-palette-frappe.patch
  31. 0 { → sources}/patches/colloid/sass-palette-latte.patch
  32. 0 { → sources}/patches/colloid/sass-palette-macchiato.patch
  33. 0 { → sources}/patches/colloid/sass-palette-mocha.patch
  34. 0 { → sources}/patches/colloid/theme-func.patch
  35. 0 { → sources}/patches/xfwm4/.gitignore
  36. 0 { → sources}/patches/xfwm4/assets-dark-normal.svg
  37. 0 { → sources}/patches/xfwm4/assets-dark.svg
  38. 0 { → sources}/patches/xfwm4/assets-light-normal.svg
  39. 0 { → sources}/patches/xfwm4/assets-light.svg
  40. +11 −8 { → sources}/patches/xfwm4/generate_assets.py
51 changes: 41 additions & 10 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -3,33 +3,64 @@ name: "Generate test artifacts"
on:
pull_request:
types: [opened, reopened, synchronize]

# env:
# TAG: latest

jobs:
build:
runs-on: ubuntu-latest

# container:
# image: ghcr.io/${{ github.repository_owner }}/${{ github.repository }}:${{ env.TAG }}
#
# # is this really necessary?
# credentials:
# username: ${{ github.actor }}
# password: ${{ secrets.GITHUB_TOKEN }}

steps:

- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

- uses: actions/setup-python@v5
with:
python-version: "3.11"
cache: "pip"

- name: Install dependencies
run: pip install -r requirements.txt
- name: Install colloid specific dependencies
run: sudo apt update && sudo apt install -y sassc inkscape optipng
run: |
sudo apt update && sudo apt install -y sassc inkscape optipng
pip install -r requirements.txt
- name: Generate themes
run: |
python patches/xfwm4/generate_assets.py
set -eu pipefile
python sources/patches/xfwm4/generate_assets.py
python ./build.py mocha --all-accents --zip -d $PWD/releases > mocha.log 2>&1 &
python ./build.py macchiato --all-accents --zip -d $PWD/releases > macchiato.log 2>&1 &
python ./build.py frappe --all-accents --zip -d $PWD/releases > frappe.log 2>&1 &
python ./build.py latte --all-accents --zip -d $PWD/releases > latte.log 2>&1 &
declare -i err=0 werr=0
while wait -fn || werr=$?; ((werr != 127)); do
err=$werr
if [[ $err -ne 0 ]]; then
echo "Build failure, abort"
cat *.log
exit 1
fi
done
cat *.log
python ./build.py mocha --all-accents --zip -d $PWD/releases &&
python ./build.py macchiato --all-accents --zip -d $PWD/releases &&
python ./build.py frappe --all-accents --zip -d $PWD/releases &&
python ./build.py latte --all-accents --zip -d $PWD/releases
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: '${{ github.sha }}-artifacts'
path: ./releases/*.zip

path: ./releases/*.zip
27 changes: 27 additions & 0 deletions .github/workflows/docker.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "Publish containers for build"

on:
workflow_dispatch:
pull_request:
# types: [opened, reopened, synchronize]
types: [synchronize]

permissions: write-all

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Generate and push image to ghcr
run: |
# build docker image for the ci
sh docker/build.sh -v no
# push the image to the registry
sh docker/push.sh -u "${{ github.actor }}" -p "${{ secrets.GITHUB_TOKEN }}"
30 changes: 24 additions & 6 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
@@ -28,22 +28,40 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true

- uses: actions/setup-python@v5
with:
python-version: "3.11"
cache: "pip"

- name: Install dependencies
run: pip install -r requirements.txt

- name: Install colloid specific dependencies
run: sudo apt update && sudo apt install -y sassc inkscape optipng

- name: Generate themes
run: |
python patches/xfwm4/generate_assets.py
python ./build.py mocha --all-accents --zip -d $PWD/releases &&
python ./build.py macchiato --all-accents --zip -d $PWD/releases &&
python ./build.py frappe --all-accents --zip -d $PWD/releases &&
python ./build.py latte --all-accents --zip -d $PWD/releases
set -eu pipefile
python sources/patches/xfwm4/generate_assets.py
python ./build.py mocha --all-accents --zip -d $PWD/releases > mocha.log 2>&1 &
python ./build.py macchiato --all-accents --zip -d $PWD/releases > macchiato.log 2>&1 &
python ./build.py frappe --all-accents --zip -d $PWD/releases > frappe.log 2>&1 &
python ./build.py latte --all-accents --zip -d $PWD/releases > latte.log 2>&1 &
declare -i err=0 werr=0
while wait -fn || werr=$?; ((werr != 127)); do
err=$werr
if [[ $err -ne 0 ]]; then
echo "Build failure, abort"
cat *.log
exit 1
fi
done
cat *.log
- name: Add zips to release
run: gh release upload ${{ needs.release-please.outputs.tag_name }} releases/*.zip
env:
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,9 @@ lib*/
*.cfg
.direnv
build/
*.log
.ruff-cache
.tmp

# Releases folder
releases
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "colloid"]
path = colloid
path = sources/colloid
url = https://github.com/vinceliuice/Colloid-gtk-theme.git
2 changes: 1 addition & 1 deletion .release-please-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "1.0.2"
".": "1.0.3"
}
13 changes: 3 additions & 10 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
# Changelog

## [1.0.2](https://github.com/catppuccin/gtk/compare/v1.0.1...v1.0.2) (2024-05-27)
## [1.0.3](https://github.com/catppuccin/gtk/compare/v1.0.2...v1.0.3) (2024-06-01)


### Bug Fixes
### Performance Improvements

* alt tab menu ([#209](https://github.com/catppuccin/gtk/issues/209)) ([cae57c8](https://github.com/catppuccin/gtk/commit/cae57c80f81fd1cc40fab2655109b09fa97103b9))

## [1.0.1](https://github.com/catppuccin/gtk/compare/v1.0.0...v1.0.1) (2024-05-27)


### Bug Fixes

* alt tab menu ([#209](https://github.com/catppuccin/gtk/issues/209)) ([cae57c8](https://github.com/catppuccin/gtk/commit/cae57c80f81fd1cc40fab2655109b09fa97103b9))
* improving performance, layout ([#215](https://github.com/catppuccin/gtk/issues/215)) ([cadc3e2](https://github.com/catppuccin/gtk/commit/cadc3e2ac24f93c6641f9f87ee5d044433c65ce7))
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -31,15 +31,15 @@ We provide a Python script to automate the process of installing the theme:
<!-- x-release-please-start-version -->

```bash
curl -LsS "https://raw.githubusercontent.com/catppuccin/gtk/main/install.py" -o install.py
curl -LsSO "https://raw.githubusercontent.com/catppuccin/gtk/v1.0.3/install.py"
python3 install.py <flavor> <accent>
[catppuccin-gtk] [INFO] - Installation info:
flavor: mocha
accent: blue
dest: /home/<user>/.local/share/themes
link: False

remote_url: https://github.com/catppuccin/gtk/releases/download/v1.0.2/catppuccin-mocha-blue-standard+default.zip
remote_url: https://github.com/catppuccin/gtk/releases/download/v1.0.3/catppuccin-mocha-blue-standard+default.zip
[catppuccin-gtk] [INFO] - Starting download...
[catppuccin-gtk] [INFO] - Response status: 200
[catppuccin-gtk] [INFO] - Download finished, zip is valid
@@ -103,7 +103,7 @@ sudo flatpak override --env=GTK_THEME="catppuccin-${FLAVOR}-${ACCENT}-standard+d

### Manual installation

If your distro does not package our theme, and the installation script will not work for your use case, you can pull down releases and extract them yourself. You can find the [latest release on GitHub](https://github.com/catppuccin/gtk/releases/latest).
If your distro does not package our theme, and the installation script will not work for your use case, you can pull down releases and extract them yourself. You can find the [latest release on GitHub](https://github.com/catppuccin/gtk/releases/tag/v1.0.3).

```bash
cd ~/.local/share/themes
@@ -112,7 +112,7 @@ cd ~/.local/share/themes
export ROOT_URL="https://https://github.com/catppuccin/gtk/releases/download"

# Change to the tag you want to download
export RELEASE="v1.0.2"
export RELEASE="v1.0.3"

# Change to suite your flavor / accent combination
export FLAVOR="mocha"
Loading