From 5d8d80fcfd278c25eb73c17cd678eecf5c0f7c48 Mon Sep 17 00:00:00 2001 From: Abraham Toriz Date: Sat, 26 Nov 2022 19:43:38 -0600 Subject: [PATCH] condense podman command lines in scripts --- README.md | 6 +++--- scripts/podman-build-aur-bin.sh | 14 ++++++++++++++ scripts/podman-build-aur-git.sh | 13 +++++++++++++ scripts/podman-build.sh | 13 +++++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100755 scripts/podman-build-aur-bin.sh create mode 100755 scripts/podman-build-aur-git.sh create mode 100644 scripts/podman-build.sh diff --git a/README.md b/README.md index 45a6267..c0924d5 100644 --- a/README.md +++ b/README.md @@ -121,13 +121,13 @@ Or build it yourself from this repo: Then build the artifacts: - podman run -it --rm -w /app -v ./:/app -v tiempo_cargo_index:/usr/local/cargo/registry -e CI_COMMIT_TAG=v1.6rc8 tiempo-build-env ./scripts/build.sh + ./scripts/podman-build.sh To build the archlinux PKGBUILDs (depends on the artifacts folder created by the previous command): - podman run -it --rm -w /app -v ./:/app:rw -e CI_COMMIT_TAG=v1.6rc8 -e CI_PROJECT_ID=27545092 --uidmap 1000:0:1 --uidmap 0:1:1000 categulario/makepkg ./scripts/release-aur-bin.sh - podman run -it --rm -w /app -v ./:/app:rw -e CI_COMMIT_TAG=v1.6rc8 --uidmap 1000:0:1 --uidmap 0:1:1000 categulario/makepkg ./scripts/release-aur-git.sh + ./scripts/podman-build-aur-bin.sh + ./scripts/podman-build-aur-git.sh Both of the previous commands produce PKGBUILDs in the current directory so if you run both sequentially you'll lose the PKGBUILD of the first command. diff --git a/scripts/podman-build-aur-bin.sh b/scripts/podman-build-aur-bin.sh new file mode 100755 index 0000000..7c9042d --- /dev/null +++ b/scripts/podman-build-aur-bin.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +if [[ -z $1 ]]; then + echo "please pass a tag as first argument. Something like v1.6.0" + exit 1 +fi + +podman run -it --rm \ + --workdir /app \ + --volume ./:/app \ + --env CI_COMMIT_TAG=$1 \ + --env CI_PROJECT_ID=27545092 \ + --uidmap 1000:0:1 --uidmap 0:1:1000 \ + categulario/makepkg ./scripts/release-aur-bin.sh diff --git a/scripts/podman-build-aur-git.sh b/scripts/podman-build-aur-git.sh new file mode 100755 index 0000000..69171e5 --- /dev/null +++ b/scripts/podman-build-aur-git.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +if [[ -z $1 ]]; then + echo "please pass a tag as first argument. Something like v1.6.0" + exit 1 +fi + +podman run -it --rm \ + --workdir /app \ + --volume ./:/app \ + --env CI_COMMIT_TAG=$1 \ + --uidmap 1000:0:1 --uidmap 0:1:1000 \ + categulario/makepkg ./scripts/release-aur-git.sh diff --git a/scripts/podman-build.sh b/scripts/podman-build.sh new file mode 100644 index 0000000..fac1b20 --- /dev/null +++ b/scripts/podman-build.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +if [[ -z $1 ]]; then + echo "please pass a tag as first argument. Something like v1.6.0" + exit 1 +fi + +podman run -it --rm \ + --workdir /app \ + --volume ./:/app \ + --volume tiempo_cargo_index:/usr/local/cargo/registry \ + --env CI_COMMIT_TAG=$1 \ + tiempo-build-env ./scripts/build.sh