mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-06-19 21:21:15 -03:00
update-dependencies: remove things used for Cirrus
See ff0afd14c2 (Remove Cirrus CI, 2026-05-28)
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
set -ex
|
||||
|
||||
command -v curl
|
||||
command -v gcloud
|
||||
command -v jq
|
||||
command -v rustup
|
||||
command -v updatecli
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
# Version set by updatecli.d/docker.yml
|
||||
FROM alpine:3.23
|
||||
LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell
|
||||
|
||||
ENV LANG=C.UTF-8
|
||||
ENV LC_ALL=C.UTF-8
|
||||
ENV PIP_ROOT_USER_ACTION=ignore
|
||||
|
||||
RUN apk add --no-cache \
|
||||
cmake ninja \
|
||||
bash \
|
||||
cargo \
|
||||
g++ \
|
||||
gettext-dev \
|
||||
git \
|
||||
libintl \
|
||||
musl-dev \
|
||||
pcre2-dev \
|
||||
py3-pexpect \
|
||||
py3-pip \
|
||||
python3 \
|
||||
rust \
|
||||
rustfmt \
|
||||
sudo \
|
||||
tmux
|
||||
|
||||
RUN pip install --break-system-packages black
|
||||
|
||||
RUN addgroup -g 1000 fishuser
|
||||
|
||||
RUN adduser \
|
||||
--disabled-password \
|
||||
--gecos "" \
|
||||
--home "/home/fishuser" \
|
||||
--ingroup fishuser \
|
||||
--uid 1000 \
|
||||
fishuser
|
||||
|
||||
RUN mkdir -p /home/fishuser/fish-build \
|
||||
&& mkdir /fish-source \
|
||||
&& chown -R fishuser:fishuser /home/fishuser /fish-source
|
||||
|
||||
USER fishuser
|
||||
WORKDIR /home/fishuser
|
||||
|
||||
COPY fish_run_tests.sh /
|
||||
|
||||
ENV FISH_CHECK_LINT=false
|
||||
|
||||
CMD /fish_run_tests.sh
|
||||
@@ -1,45 +0,0 @@
|
||||
# Version set by updatecli.d/docker.yml
|
||||
FROM ubuntu:22.04
|
||||
LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell
|
||||
|
||||
ENV LANG=C.UTF-8
|
||||
ENV LC_ALL=C.UTF-8
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get -y install --no-install-recommends \
|
||||
cmake ninja-build \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
clang \
|
||||
curl \
|
||||
gettext \
|
||||
git \
|
||||
libpcre2-dev \
|
||||
locales \
|
||||
openssl \
|
||||
python3 \
|
||||
python3-pexpect \
|
||||
sudo \
|
||||
tmux \
|
||||
&& locale-gen en_US.UTF-8 \
|
||||
&& apt-get clean
|
||||
|
||||
RUN groupadd -g 1000 fishuser \
|
||||
&& useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
|
||||
&& adduser fishuser sudo \
|
||||
&& mkdir -p /home/fishuser/fish-build \
|
||||
&& mkdir /fish-source \
|
||||
&& chown -R fishuser:fishuser /home/fishuser /fish-source
|
||||
|
||||
USER fishuser
|
||||
WORKDIR /home/fishuser
|
||||
|
||||
RUN curl --proto '=https' --tlsv1.2 -fsS https://sh.rustup.rs > /tmp/rustup.sh \
|
||||
&& sh /tmp/rustup.sh -y --no-modify-path
|
||||
ENV PATH=/home/fishuser/.cargo/bin:$PATH
|
||||
|
||||
COPY fish_run_tests.sh /
|
||||
|
||||
ENV FISH_CHECK_LINT=false
|
||||
|
||||
CMD /fish_run_tests.sh
|
||||
@@ -1,21 +0,0 @@
|
||||
name: "Update FreeBSD image used in Cirrus CI"
|
||||
|
||||
sources:
|
||||
freebsd_stable_version:
|
||||
kind: shell
|
||||
spec:
|
||||
shell: bash
|
||||
command: |
|
||||
set -eo pipefail
|
||||
gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images |
|
||||
grep -o '^freebsd-.*-release-amd64-ufs' |
|
||||
tail -1
|
||||
targets:
|
||||
cirrus_freebsd_stable_version:
|
||||
name: "Update FreeBSD stable version"
|
||||
sourceid: freebsd_stable_version
|
||||
kind: file
|
||||
spec:
|
||||
file: .cirrus.yml
|
||||
matchpattern: "image: freebsd-.*-release-amd64-ufs.*"
|
||||
replacepattern: 'image: {{ source "freebsd_stable_version" }} # updatecli.d/cirrus-freebsd.yml'
|
||||
@@ -1,13 +1,6 @@
|
||||
name: "Update Linux docker images"
|
||||
|
||||
sources:
|
||||
alpine_latest_version:
|
||||
kind: dockerimage
|
||||
spec:
|
||||
image: alpine
|
||||
tagfilter: "^[0-9]+\\.[0-9]+$"
|
||||
versionfilter:
|
||||
kind: semver
|
||||
ubuntu_latest_lts_version:
|
||||
kind: shell
|
||||
spec:
|
||||
@@ -22,31 +15,8 @@ sources:
|
||||
' |
|
||||
sort --version-sort |
|
||||
tail -1
|
||||
ubuntu_oldest_non_eol_version:
|
||||
kind: shell
|
||||
spec:
|
||||
shell: bash
|
||||
command: |
|
||||
set -eo pipefail
|
||||
today=$(date --iso-8601)
|
||||
curl -fsS https://endoflife.date/api/ubuntu.json |
|
||||
jq -r --arg today "$today" '
|
||||
.[]
|
||||
| select(.eol >= $today)
|
||||
| "\(.cycle)"
|
||||
' |
|
||||
sort --version-sort |
|
||||
head -1
|
||||
|
||||
targets:
|
||||
update_alpine_dockerfile:
|
||||
name: "Update Alpine Linux version"
|
||||
sourceid: alpine_latest_version
|
||||
kind: file
|
||||
spec:
|
||||
file: docker/alpine.Dockerfile
|
||||
matchpattern: "FROM alpine:.*"
|
||||
replacepattern: 'FROM alpine:{{ source "alpine_latest_version" }}'
|
||||
ubuntu_latest_version_dockerfile:
|
||||
name: "Update oldest non-EOL Ubuntu Linux version"
|
||||
sourceid: ubuntu_latest_lts_version
|
||||
@@ -55,11 +25,3 @@ targets:
|
||||
file: docker/ubuntu-latest-lts.Dockerfile
|
||||
matchpattern: "FROM ubuntu:.*"
|
||||
replacepattern: 'FROM ubuntu:{{ source "ubuntu_latest_lts_version" }}'
|
||||
ubuntu_oldest_supported_dockerfile:
|
||||
name: "Update oldest non-EOL Ubuntu Linux version"
|
||||
sourceid: ubuntu_oldest_non_eol_version
|
||||
kind: file
|
||||
spec:
|
||||
file: docker/ubuntu-oldest-supported.Dockerfile
|
||||
matchpattern: "FROM ubuntu:.*"
|
||||
replacepattern: 'FROM ubuntu:{{ source "ubuntu_oldest_non_eol_version" }}'
|
||||
|
||||
Reference in New Issue
Block a user