Skip to content

Commit 29732d2

Browse files
committed
Merge branch 'main' of github.com:instantOS/extra
2 parents 32387b8 + 54d290f commit 29732d2

File tree

4 files changed

+41
-10
lines changed

4 files changed

+41
-10
lines changed

.github/workflows/build.yml

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,44 @@ on:
55
branches:
66
- main
77

8+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
9+
permissions:
10+
contents: read
11+
pages: write
12+
id-token: write
13+
14+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
15+
concurrency:
16+
group: "pages"
17+
cancel-in-progress: false
18+
819
jobs:
920
build:
21+
timeout-minutes: 2880
1022
runs-on: self-hosted
1123
# No container directive here, we run on the host
1224

1325
steps:
1426
- name: Checkout code
15-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
1628

1729
- name: Build Packages
1830
run: ./build.sh
1931

20-
- name: Deploy to GitHub Pages
21-
uses: peaceiris/actions-gh-pages@v3
32+
- name: Generate Directory Listing
33+
uses: gacts/directory-listing@v1
2234
with:
23-
github_token: ${{ secrets.GITHUB_TOKEN }}
24-
publish_dir: ./repo
25-
force_orphan: true
35+
target: ./repo
36+
show-hidden: false
37+
overwrite: true
38+
39+
- name: Setup Pages
40+
uses: actions/configure-pages@v4
41+
42+
- name: Upload artifact
43+
uses: actions/upload-pages-artifact@v3
44+
with:
45+
path: ./repo
2646

2747
- name: Cleanup
2848
if: always()
@@ -31,3 +51,14 @@ jobs:
3151
sudo chown -R $USER:$USER . || true
3252
echo "Pruning Docker..."
3353
docker system prune -af || true
54+
55+
deploy:
56+
environment:
57+
name: github-pages
58+
url: ${{ steps.deployment.outputs.page_url }}
59+
runs-on: ubuntu-latest
60+
needs: build
61+
steps:
62+
- name: Deploy to GitHub Pages
63+
id: deployment
64+
uses: actions/deploy-pages@v4

aurpackages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ pamac-aur
77
pa-applet-git
88
skippy-xd-git
99
yay
10-
topgrade
10+
topgrade-bin

packages/ins/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ optdepends=(
1313
'kitty: default terminal for scratchpad'
1414
)
1515
source=("$pkgname-$pkgver.tar.gz::https://github.com/instantOS/instantCLI/archive/refs/tags/v$pkgver.tar.gz")
16-
sha256sums=('SKIP') # Will be calculated after first release
17-
options=('!lto') # Disable LTO as recommended for Rust packages
16+
sha256sums=('SKIP') # Will be calculated after first release
17+
options=('!lto') # Disable LTO as recommended for Rust packages
1818

1919
prepare() {
2020
cd "instantCLI-$pkgver"

packages/instantdepend/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ depends=('picom'
5656
'zoxide'
5757
'mise'
5858
'jq'
59-
'topgrade'
59+
'topgrade-bin'
6060
'htop'
6161
'pa-applet-git'
6262
'network-manager-applet'

0 commit comments

Comments
 (0)