* Re: [PR PATCH] [Updated] .travis.yml: remove file.
2020-11-17 2:43 [PR PATCH] .travis.yml: remove file ericonr
2020-11-18 18:51 ` Chocimier
@ 2020-11-18 20:02 ` ericonr
2020-11-18 20:12 ` ericonr
2020-11-20 23:11 ` [PR PATCH] [Merged]: " jnbr
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2020-11-18 20:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages ci
https://github.com/void-linux/void-packages/pull/26449
.travis.yml: remove file.
Disable Travis CI.
A patch file from https://github.com/void-linux/void-packages/pull/26449.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ci-26449.patch --]
[-- Type: text/x-diff, Size: 5221 bytes --]
From 2acd5e66e5cba1bf4168a7c845b8fa4180e72b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 16 Nov 2020 23:42:30 -0300
Subject: [PATCH] Disable Travis CI.
- Remove .travis.yml, common/travis/docker.sh.
- Change references to travis to be more generic.
- Manual.md: Orient against using CI logs in broken= or nocross=.
---
.travis.yml | 41 -----------------------------------------
Manual.md | 6 ++----
README.md | 2 +-
common/travis/docker.sh | 18 ------------------
xbps-src | 2 +-
5 files changed, 4 insertions(+), 65 deletions(-)
delete mode 100644 .travis.yml
delete mode 100755 common/travis/docker.sh
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 42ef134aa4d..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-language: bash
-dist: bionic
-
-git:
- depth: 200
-
-env:
- global:
- - PATH=$PATH:/tmp/bin
- - DOCKER_BASE=voidlinux/masterdir
- - TAG=20200607RC01
-
- matrix:
- - XLINT=1 LICENSE_LIST=common/travis/license.lst
- - ARCH=x86_64 BOOTSTRAP=x86_64
- - ARCH=i686 BOOTSTRAP=i686
- - ARCH=aarch64 BOOTSTRAP=x86_64
- - ARCH=armv7l BOOTSTRAP=x86_64
- - ARCH=x86_64-musl BOOTSTRAP=x86_64-musl
- - ARCH=armv6l-musl BOOTSTRAP=x86_64-musl
- - ARCH=aarch64-musl BOOTSTRAP=x86_64-musl
-
-install:
- - common/travis/docker.sh
-
-before_script:
- - common/travis/set_mirror.sh
- - common/travis/prepare.sh
- - common/travis/fetch_upstream.sh
- - common/travis/changed_templates.sh
- - common/travis/fetch-xtools.sh
- - common/travis/xlint.sh
-
-script:
- - if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/build.sh $BOOTSTRAP $ARCH; fi
-
-after_script:
- - if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/show_files.sh $BOOTSTRAP $ARCH; fi
-
-notifications:
- email: false
diff --git a/Manual.md b/Manual.md
index 0833d5fdd1c..c520d06c133 100644
--- a/Manual.md
+++ b/Manual.md
@@ -631,8 +631,7 @@ in /usr/share directory specified by absolute path, which are expected and allow
specified by absolute path, which are expected and allowed to contain machine code files.
- `nocross` If set, cross compilation won't be allowed and will exit immediately.
-This should be set to a string describing why it fails, or a link to a travis
-buildlog demonstrating the failure.
+This should be set to a string describing why it fails, or a link to a buildlog (from the official builders, CI buildlogs can vanish) demonstrating the failure.
- `restricted` If set, xbps-src will refuse to build the package unless
`etc/conf` has `XBPS_ALLOW_RESTRICTED=yes`. The primary builders for Void
@@ -645,8 +644,7 @@ to override the guessed list. Only use this if a specific order of subpackages i
otherwise the default would work in most cases.
- `broken` If set, building the package won't be allowed because its state is currently broken.
-This should be set to a string describing why it is broken, or a link to a travis
-buildlog demonstrating the failure.
+This should be set to a string describing why it is broken, or a link to a buildlog demonstrating the failure.
- `shlib_provides` A white space separated list of additional sonames the package provides on.
This appends to the generated file rather than replacing it.
diff --git a/README.md b/README.md
index 9238b1918ef..ce2d49d2a4a 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ into a `masterdir` that is used as its main `chroot` directory. `xbps-src` suppo
multiple utilities to accomplish this task:
- `bwrap` - bubblewrap, see https://github.com/projectatomic/bubblewrap.
- - `ethereal` - only useful for one-shot containers, i.e docker (used with travis).
+ - `ethereal` - only useful for one-shot containers, i.e docker (used with CI).
- `xbps-uunshare(1)` - XBPS utility that uses `user_namespaces(7)` (part of xbps, default).
- `xbps-uchroot(1)` - XBPS utility that uses `namespaces` and must be `setgid` (part of xbps).
- `proot(1)` - utility that implements chroot/bind mounts in user space, see https://proot-me.github.io/.
diff --git a/common/travis/docker.sh b/common/travis/docker.sh
deleted file mode 100755
index 9b98b42c016..00000000000
--- a/common/travis/docker.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# docker.sh
-
-[ "$XLINT" ] && exit 0
-
-DOCKER_NAME=${DOCKER_NAME:-void}
-
-/bin/echo -e "\x1b[32mPulling docker image $DOCKER_BASE-$BOOTSTRAP:$TAG...\x1b[0m"
-docker pull $DOCKER_BASE-$BOOTSTRAP:$TAG
-docker run -d \
- --name $DOCKER_NAME \
- -v "$(pwd)":/hostrepo \
- -v /tmp:/tmp \
- -e XLINT="$XLINT" \
- -e PATH="$PATH" \
- $DOCKER_BASE-$BOOTSTRAP:$TAG \
- /bin/sh -c 'sleep inf'
diff --git a/xbps-src b/xbps-src
index 3cd19dc42ec..ad999439d3a 100755
--- a/xbps-src
+++ b/xbps-src
@@ -486,7 +486,7 @@ if [ -z "$IN_CHROOT" ]; then
fi
# Forbid root unless XBPS_ALLOW_CHROOT_BREAKOUT is set
-# (for travis CI).
+# (for CI).
if [ -z "$IN_CHROOT" -a "$UID" -eq 0 -a -z "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
echo "ERROR: xbps-src cannot be used as root." 1>&2
exit 1
^ permalink raw reply [flat|nested] 5+ messages in thread