From c1ef3942f34c94e3638cf8bdffdaf5ee8fcbbb1f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 16 Dec 2024 16:56:57 +0000 Subject: [PATCH 1/2] Switch to quay.io vs registry.ci The old one was a mirror that seems to have finally been decommissioned. --- .github/workflows/docs.yml | 2 +- .github/workflows/tests.yml | 6 +++--- ci/prow/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9d9fe30ede..3e3c42951b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -25,7 +25,7 @@ jobs: build: name: Build documentation runs-on: ubuntu-latest - container: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel + container: quay.io/coreos-assembler/fcos-buildroot:testing-devel steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 97f8eae167..aa99357b84 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: codestyle: name: "Code style" runs-on: ubuntu-latest - container: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel + container: quay.io/coreos-assembler/fcos-buildroot:testing-devel steps: - name: Checkout repository uses: actions/checkout@v2 @@ -60,7 +60,7 @@ jobs: minimal: name: "Build - FCOS minimal" runs-on: ubuntu-latest - container: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel + container: quay.io/coreos-assembler/fcos-buildroot:testing-devel steps: - name: Checkout repository uses: actions/checkout@v2 @@ -78,7 +78,7 @@ jobs: build-c: name: "Build (Fedora)" runs-on: ubuntu-latest - container: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel + container: quay.io/coreos-assembler/fcos-buildroot:testing-devel steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/ci/prow/Dockerfile b/ci/prow/Dockerfile index 32215ca0e6..8fee585a74 100644 --- a/ci/prow/Dockerfile +++ b/ci/prow/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel as builder +FROM quay.io/coreos-assembler/fcos-buildroot:testing-devel as builder WORKDIR /src COPY . . RUN env ./ci/build.sh && make install DESTDIR=/cosa/component-install @@ -7,7 +7,7 @@ RUN make -C tests/kolainst install DESTDIR=/cosa/component-tests # Uncomment this to fake a build to test the code below #RUN mkdir -p /cosa/component-install/usr/bin && echo foo > /cosa/component-install/usr/bin/foo -FROM registry.ci.openshift.org/coreos/coreos-assembler:latest +FROM quay.io/coreos-assembler/coreos-assembler:latest WORKDIR /srv USER root # Copy binaries from the build From eb9aab652a21d14713a841cb3879d44aed5c9d85 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 16 Dec 2024 17:03:03 +0000 Subject: [PATCH 2/2] deny: Add Unicode-3.0 This is under e.g. https://docs.fedoraproject.org/en-US/legal/allowed-licenses/ and is now used by the unicode-ident crate. --- deny.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deny.toml b/deny.toml index 1a809ffcd6..42ab97911b 100644 --- a/deny.toml +++ b/deny.toml @@ -1,7 +1,7 @@ [licenses] unlicensed = "deny" copyleft = "allow" -allow = ["Apache-2.0", "Apache-2.0 WITH LLVM-exception", "MIT", "BSD-3-Clause", "BSD-2-Clause", "Unlicense", "Unicode-DFS-2016"] +allow = ["Apache-2.0", "Apache-2.0 WITH LLVM-exception", "MIT", "BSD-3-Clause", "BSD-2-Clause", "Unlicense", "Unicode-DFS-2016", "Unicode-3.0"] private = { ignore = true } [bans]