1
0
Fork 0
mirror of https://github.com/xHyroM/void-packages.git synced 2024-11-21 22:21:05 +01:00

refactor: cleanup

This commit is contained in:
Jozef Steinhübl 2024-07-15 12:36:25 +02:00
parent 5e8230f37d
commit 863a72fa92
No known key found for this signature in database
GPG key ID: E6BC90C91973B08F
10 changed files with 8 additions and 274 deletions

View file

@ -2,12 +2,6 @@ name: Bug Report
description: File a bug report description: File a bug report
labels: ["bug", "needs-testing"] labels: ["bug", "needs-testing"]
body: body:
- type: markdown
attributes:
value: >
#### Don't request an update of a package,
[We have a script for that](https://repo-default.voidlinux.org/void-updates/void-updates.txt).
However, a quality pull request may help.
- id: verified - id: verified
type: dropdown type: dropdown
attributes: attributes:

View file

@ -1,5 +1,5 @@
blank_issues_enabled: true blank_issues_enabled: true
contact_links: contact_links:
- name: Other kind of issue - name: Other kind of issue
url: https://github.com/void-linux/void-packages/issues/new url: https://github.com/xHyroM/void-packages/issues/new
about: For RFCs, tracking issues, etc (freeform text) about: For RFCs, tracking issues, etc (freeform text)

View file

@ -3,12 +3,6 @@ title: "Package request: "
description: Request the addition of a package description: Request the addition of a package
labels: ["request"] labels: ["request"]
body: body:
- type: markdown
attributes:
value: >
#### Don't request an update of a package,
[We have a script for that](https://repo-default.voidlinux.org/void-updates/void-updates.txt).
However, a quality pull request may help.
- id: name - id: name
type: input type: input
attributes: attributes:
@ -38,7 +32,7 @@ body:
attributes: attributes:
label: Does the requested package meet the package requirements? label: Does the requested package meet the package requirements?
description: | description: |
See [CONTRIBUTING.md](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements) for details See [CONTRIBUTING.md](https://github.com/xHyroM/void-packages/blob/main/CONTRIBUTING.md#package-requirements) for details
multiple: true multiple: true
options: options:
- System - System
@ -51,7 +45,7 @@ body:
attributes: attributes:
label: Is the requested package released? label: Is the requested package released?
description: | description: |
See [CONTRIBUTING.md](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements) for details See [CONTRIBUTING.md](https://github.com/xHyroM/void-packages/blob/main/CONTRIBUTING.md#package-requirements) for details
options: options:
- "Yes" - "Yes"
- "No" - "No"

View file

@ -1,8 +1,4 @@
<!-- <!--
if you are creating a bug report or package request, please fill out one of the forms here: if you are creating a bug report or package request, please fill out one of the forms here:
https://github.com/void-linux/void-packages/issues/new/choose https://github.com/xHyroM/void-packages/issues/new/choose
Don't request an update of a package, We have a script for that:
https://repo-default.voidlinux.org/void-updates/void-updates.txt
However, a quality pull request may help.
--> -->

View file

@ -5,11 +5,11 @@
<!-- <!--
#### New package #### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO** - This new package conforms to the [package requirements](https://github.com/xHyroM/void-packages/blob/main/CONTRIBUTING.md#package-requirements): **YES**|**NO**
--> -->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in <!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration https://github.com/xHyroM/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build. and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI. Ignore this section if this PR is not skipping CI.
--> -->

View file

@ -1,143 +0,0 @@
name: Check build
on:
pull_request:
paths:
- 'srcpkgs/**'
push:
paths:
- 'srcpkgs/**'
workflow_dispatch:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
# Lint changed templates.
xlint:
name: Lint templates
runs-on: ubuntu-latest
container:
image: 'ghcr.io/void-linux/void-buildroot-musl:20231230R1'
env:
PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
LICENSE_LIST: common/travis/license.lst
steps:
- name: Prepare container
run: |
# switch to repo-ci mirror
mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf
# Sync and upgrade once, assume error comes from xbps update
xbps-install -Syu || xbps-install -yu xbps
# Upgrade again (in case there was a xbps update)
xbps-install -yu
# install tools needed for lints
xbps-install -y grep curl git
- name: Clone and checkout
uses: classabbyamp/treeless-checkout-action@v1
- name: Create hostrepo and prepare masterdir
run: |
ln -s "$(pwd)" /hostrepo &&
common/travis/set_mirror.sh &&
common/travis/prepare.sh &&
common/travis/fetch-xtools.sh
- run: common/travis/changed_templates.sh
- name: Run lints
run: |
rv=0
common/travis/xlint.sh || rv=1
common/travis/verify-update-check.sh || rv=1
exit $rv
# Build changed packages.
build:
name: Build packages
runs-on: ubuntu-latest
if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
container:
image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20231230R1
options: --platform ${{ matrix.config.platform }}
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}'
BOOTSTRAP: '${{ matrix.config.host }}'
TEST: '${{ matrix.config.test }}'
HOSTREPO: /hostrepo
strategy:
fail-fast: false
matrix:
config:
- { arch: x86_64, host: x86_64, libc: glibc, platform: linux/amd64, test: 1 }
- { arch: i686, host: i686, libc: glibc, platform: linux/386, test: 1 }
- { arch: aarch64, host: x86_64, libc: glibc, platform: linux/amd64, test: 0 }
- { arch: armv7l, host: x86_64, libc: glibc, platform: linux/amd64, test: 0 }
- { arch: x86_64-musl, host: x86_64-musl, libc: musl, platform: linux/amd64, test: 1 }
- { arch: armv6l-musl, host: x86_64-musl, libc: musl, platform: linux/amd64, test: 0 }
- { arch: aarch64-musl, host: x86_64-musl, libc: musl, platform: linux/amd64, test: 0 }
steps:
- name: Prepare container
run: |
# switch to repo-ci mirror
mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
sed -i 's|repo-default|repo-ci|g' /etc/xbps.d/*-repository-*.conf
# Sync and upgrade once, assume error comes from xbps update
xbps-install -Syu || xbps-install -yu xbps
# Upgrade again (in case there was a xbps update)
xbps-install -yu
- name: Clone and checkout
uses: classabbyamp/treeless-checkout-action@v1
- name: Create hostrepo and prepare masterdir
run: |
ln -s "$(pwd)" /hostrepo &&
common/travis/set_mirror.sh &&
common/travis/prepare.sh &&
common/travis/fetch-xtools.sh
- run: common/travis/changed_templates.sh
- name: Build and check packages
run: |
(
here="$(pwd)"
cd /
"$here/common/travis/build.sh" "$BOOTSTRAP" "$ARCH" "$TEST"
)
- name: Show files
run: |
(
here="$(pwd)"
cd /
"$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH"
)
- name: Compare to previous
run: |
(
here="$(pwd)"
cd /
"$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
)
- name: Check file conflicts
if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
run: |
if [ -s /tmp/templates ]; then
xlocate -S &&
common/scripts/lint-conflicts $HOME/hostdir/binpkgs
fi
- name: Verify repository state
run: |
(
here="$(pwd)"
cd /
"$here/common/travis/check-install.sh" "$BOOTSTRAP" "$ARCH"
)

View file

@ -1,98 +0,0 @@
---
name: 'Build buildroot containers'
on:
workflow_dispatch:
pull_request:
branches:
- master
paths:
- common/container/**
push:
branches:
- master
paths:
- common/container/**
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
strategy:
matrix:
libc:
- glibc
- musl
steps:
- name: Checkout
uses: classabbyamp/treeless-checkout-action@v1
- name: Get image release
id: release
run: |
# gets the list of all date-shaped tags for the image, finds the most recent one
tag="$(skopeo list-tags "docker://ghcr.io/${{ github.repository_owner }}/void-buildroot-${{ matrix.libc }}" | \
jq -r '.Tags | sort | reverse | map(select(test("^[0-9]{8}(R[0-9]+)?$")))[0]')"
# tags from a different day or pre-YYYYMMDDRN
if [ "${tag%R*}" != "$(date -u +%Y%m%d)" ] || [ "${tag%R*}" = "${tag}" ]; then
rel=1
else
rel=$(( ${tag##*R} + 1 ))
fi
echo "rel=${rel}" >> "${GITHUB_OUTPUT}"
- name: Docker metadata
id: meta
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/${{ github.repository_owner }}/void-buildroot-${{ matrix.libc }}
tags: |
type=sha,prefix=
type=raw,value=latest,enable={{is_default_branch}}
type=raw,value={{date 'YYYYMMDD'}}R${{ steps.release.outputs.rel }},enable={{is_default_branch}},priority=1000
flavor: latest=false
labels: |
org.opencontainers.image.authors=Void Linux team and contributors
org.opencontainers.image.url=https://voidlinux.org
org.opencontainers.image.documentation=https://github.com/${{ github.repository }}
org.opencontainers.image.source=https://github.com/${{ github.repository }}
org.opencontainers.image.vendor=Void Linux
org.opencontainers.image.title=Void Linux build root
org.opencontainers.image.description=Image for building packages with xbps-src on Void Linux
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to GCHR
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push images
id: build_and_push
uses: docker/bake-action@v3
with:
push: ${{ github.event_name != 'pull_request' }}
targets: void-buildroot-${{ matrix.libc }}
files: |
common/container/docker-bake.hcl
${{ steps.meta.outputs.bake-file }}
set: |
_common.cache-to=type=gha
_common.cache-from=type=gha

View file

@ -1,4 +1,4 @@
name: Pages name: Release
on: on:
workflow_dispatch: workflow_dispatch:

View file

@ -32,15 +32,6 @@ $ xi <package-name>
$ git clean -dfx $ git clean -dfx
``` ```
## Packages
- [vesktop](./srcpkgs/vesktop) → https://github.com/Vencord/Vesktop/
- [google chrome](./srcpkgs/google-chrome) → https://www.google.com/chrome/
- [visual studio code](./srcpkgs/visual-studio-code) → https://code.visualstudio.com/
- [pollymc](./srcpkgs/pollymc) → https://github.com/fn2006/PollyMC
- [anydesk](./srcpkgs/anydesk) → https://anydesk.com
- [ms-365-electron](./srcpkgs/ms-365-electron) → https://github.com/agam778/MS-365-Electron
The included `xbps-src` script will fetch and compile the sources, and install its The included `xbps-src` script will fetch and compile the sources, and install its
files into a `fake destdir` to generate XBPS binary packages that can be installed files into a `fake destdir` to generate XBPS binary packages that can be installed
or queried through the `xbps-install(1)` and `xbps-query(1)` utilities, respectively. or queried through the `xbps-install(1)` and `xbps-query(1)` utilities, respectively.

View file

@ -1,7 +1,7 @@
# Template file for 'vesktop' # Template file for 'vesktop'
pkgname='vesktop' pkgname='vesktop'
version='1.5.2' version='1.5.3'
revision='1' revision='1'
arch='x86_64' arch='x86_64'
short_desc='Vesktop gives you the performance of web Discord and the comfort of Discord Desktop' short_desc='Vesktop gives you the performance of web Discord and the comfort of Discord Desktop'