Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
itshog committed May 2, 2024
2 parents 9341179 + 137b57b commit 21771df
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 4 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Release

on:
release:
types: [published]

jobs:
publish_aur_package:
name: Publish AUR package
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Generate PKGBUILD
env:
RELEASE: ${{ github.event.release.tag_name }}
run: ./scripts/generate-pkgbuild.sh

- name: Publish firefox-gnome-theme to the AUR
uses: KSXGitHub/[email protected]
with:
pkgname: firefox-gnome-theme
pkgbuild: ./PKGBUILD
commit_username: ${{ secrets.AUR_USERNAME }}
commit_email: ${{ secrets.AUR_EMAIL }}
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
commit_message: ${{ github.event.release.tag_name }}
updpkgsums: true
test: true
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
name: Test

on: [push]

jobs:
Expand All @@ -16,7 +18,7 @@ jobs:
echo 'Unattended-Upgrade::Allowed-Origins:: "LP-PPA-mozillateam:${distro_codename}";' | sudo tee /etc/apt/apt.conf.d/51unattended-upgrades-firefox
sudo apt update
sudo apt install firefox
- name: Setup 1 - create a Firefox profile
run: firefox --headless --createprofile test

Expand All @@ -26,7 +28,6 @@ jobs:
- name: Teardown 1
run: rm -rf ls ~/.mozilla/firefox/


- name: Setup 2 - create a new Firefox profile
run: firefox --headless --createprofile test

Expand All @@ -38,4 +39,3 @@ jobs:

- name: Teardown 2
run: rm -rf ls ~/.mozilla/firefox/

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#customChrome.css
#customContent.css
PKGBUILD
42 changes: 42 additions & 0 deletions scripts/generate-pkgbuild.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!/bin/sh

# Exit on error
set -e

if [ -z "$RELEASE" ]; then
echo "\$RELEASE not set, aborting"
exit 1
fi

pkgver=$(echo "$RELEASE" | sed 's/v//')

cat << EOF > ./PKGBUILD
# Maintainer: Marko Korhonen <[email protected]>
# Based on the existing AUR package firefox-gnome-theme-git
# This PKGBUILD is automatically generated by https://github.com/rafaelmardojai/firefox-gnome-theme/blob/$RELEASE/scripts/generate-pkgbuild.sh
# when a release is published on GitHub. Do not edit this file directly.
pkgname=firefox-gnome-theme
pkgver=$pkgver
pkgrel=1
pkgdesc='A GNOME theme for Firefox'
arch=('any')
url="https://github.com/rafaelmardojai/\$pkgname"
license=('Unlicense')
optdepends=('firefox: primary compatible browser' 'librewolf: alternative compatible browser')
conflicts=("\$pkgname-git")
install="\$pkgname.install"
source=("\$pkgname-\$pkgver.tar.gz::https://github.com/rafaelmardojai/\$pkgname/archive/refs/tags/v\$pkgver.tar.gz" "INSTALL.md")
md5sums=('TO_BE_GENERATED'
'25f18456221ffc91f472b1abff8aae84')
package() {
cd "\$srcdir/\$pkgname-\$pkgver"
install -d "\$pkgdir/usr/lib/\$pkgname"
cp -ra theme userChrome.css userContent.css configuration "\$pkgdir/usr/lib/\$pkgname"
# Install docs
install -Dm644 README.md "\$pkgdir/usr/share/doc/\$pkgname/README.md"
install -Dm644 "\$srcdir/INSTALL.md" "\$pkgdir/usr/share/doc/\$pkgname/INSTALL.md"
}
EOF
2 changes: 1 addition & 1 deletion theme/parts/urlbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

#urlbar-container {
--urlbar-container-height: 0 !important;
--urlbar-container-height: 34px !important;
}

/* Center the URL bar */
Expand Down

0 comments on commit 21771df

Please sign in to comment.