From e5e80680a99f07e2f578a6f9c287401d042e0510 Mon Sep 17 00:00:00 2001 From: lea Date: Fri, 31 May 2024 12:10:30 -0700 Subject: [PATCH] chore: EOL 38 since it's EOL upstream --- .backportrc.json | 2 +- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- .github/workflows/update-comps.yml | 3 +-- .github/workflows/update-nightly.yml | 1 - .github/workflows/update.yml | 1 - README.md | 1 - 7 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.backportrc.json b/.backportrc.json index 1a999fa4f8..1c7b5305f4 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -2,7 +2,7 @@ "repoOwner": "terrapkg", "repoName": "packages", "resetAuthor": true, - "targetBranchChoices": ["f38", "f39", "f40", "frawhide"], + "targetBranchChoices": ["f39", "f40", "frawhide"], "branchLabelMapping": { "^sync-(.+)$": "$1" } diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 97bdb28677..67cfb1eb56 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -ARG VARIANT="38" +ARG VARIANT="rawhide" FROM fedora:${VARIANT} RUN useradd -m vscode diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8deec02a20..ed271bdb32 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "Fedora", "build": { "dockerfile": "Dockerfile", - "args": { "VARIANT": "38" } + "args": { "VARIANT": "rawhide" } }, "remoteUser": "vscode", "runArgs": [ diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml index 5be8e2e8bd..40c20d9c2a 100644 --- a/.github/workflows/update-comps.yml +++ b/.github/workflows/update-comps.yml @@ -4,9 +4,8 @@ on: push: branches: - frawhide + - f40 - f39 - - f38 - - f37 paths: - comps.xml workflow_dispatch: diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index e8d3e05499..3496031287 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -46,7 +46,6 @@ jobs: git add * git commit -S -a -m "$msg" } - copy_over f38 || true copy_over f39 || true copy_over f40 || true git push -u origin --all diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 9ee672acc3..47f81d5820 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -47,7 +47,6 @@ jobs: git add * git commit -S -a -m "$msg" } - copy_over f38 || true copy_over f39 || true copy_over f40 || true git push -u origin --all diff --git a/README.md b/README.md index 56f67cb2af..a8cc101566 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Terra Sources -[![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38) [![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39) [![Repository status](https://repology.org/badge/repository-big/terra_40.svg?header=Terra+40)](https://repology.org/repository/terra_40) [![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide)