manjaro: Rename to archlinux

This commit is contained in:
June Tate-Gans 2024-03-29 10:18:38 -05:00
parent 9e9869eea6
commit 6f92869f6e
3 changed files with 10 additions and 10 deletions

View File

@ -1,7 +1,7 @@
--- ---
kind: pipeline kind: pipeline
type: drone type: drone
name: manjaro name: archlinux
steps: steps:
- name: build - name: build
@ -20,7 +20,7 @@ steps:
mtu: 1000 mtu: 1000
commands: commands:
- tools/dockerbuild.sh manjaro - tools/dockerbuild.sh archlinux
- name: test - name: test
image: archlinux:latest image: archlinux:latest

View File

@ -15,8 +15,8 @@ ifeq (${DISTRO},ubuntu)
DISTRO := debian DISTRO := debian
endif endif
ifeq (${DISTRO},arch) ifeq (${DISTRO},manjaro)
DISTRO := manjaro DISTRO := archlinux
endif endif
$(warning Building on ${DISTRO}) $(warning Building on ${DISTRO})
@ -29,18 +29,18 @@ clean: ${DISTRO}-clean
install: ${DISTRO}-install install: ${DISTRO}-install
manjaro: archlinux:
mkdir -p build mkdir -p build
makepkg --nodeps makepkg --nodeps
mv g13gui*.pkg.tar.zst build mv g13gui*.pkg.tar.zst build
manjaro-clean: archlinux-clean:
rm -f g13gui-git-*-any.pkg.tar.zst rm -f g13gui-git-*-any.pkg.tar.zst
rm -rf g13gui-git/ rm -rf g13gui-git/
rm -rf pkg/ rm -rf pkg/
rm -rf src/ rm -rf src/
manjaro-install: archlinux-install:
makepkg -i makepkg -i
fedora: fedora:
@ -86,9 +86,9 @@ dist: clean
tar --exclude=build --exclude=.drone.yml --exclude-vcs -zcf build/g13gui_$(VERSION).tar.gz . tar --exclude=build --exclude=.drone.yml --exclude-vcs -zcf build/g13gui_$(VERSION).tar.gz .
docker run -ti -v ${PWD}:/srcs -w /srcs fedora:latest tools/dockerbuild.sh fedora docker run -ti -v ${PWD}:/srcs -w /srcs fedora:latest tools/dockerbuild.sh fedora
docker run -ti -v ${PWD}:/srcs -w /srcs debian:latest tools/dockerbuild.sh debian docker run -ti -v ${PWD}:/srcs -w /srcs debian:latest tools/dockerbuild.sh debian
docker run -ti -v ${PWD}:/srcs -w /srcs archlinux:latest tools/dockerbuild.sh arch docker run -ti -v ${PWD}:/srcs -w /srcs archlinux:latest tools/dockerbuild.sh archlinux
.PHONY: all clean install test .PHONY: all clean install test
.PHONY: manjaro manjaro-clean manjaro-install .PHONY: archlinux archlinux-clean archlinux-install
.PHONY: debian debian-build debian-clean debian-build-source debian-release .PHONY: debian debian-build debian-clean debian-build-source debian-release

View File

@ -19,7 +19,7 @@ DISTRO="$1"; shift
[[ -z "${DISTRO}" ]] && die "Usage: dockerbuild.sh <distro>" [[ -z "${DISTRO}" ]] && die "Usage: dockerbuild.sh <distro>"
case "${DISTRO}" in case "${DISTRO}" in
manjaro) archlinux)
try pacman -Sy --noconfirm try pacman -Sy --noconfirm
try pacman -S --noconfirm base-devel python meson lsb-release git try pacman -S --noconfirm base-devel python meson lsb-release git