Skip to content

Commit

Permalink
Change BASE_IMAGE to Fedora 39
Browse files Browse the repository at this point in the history
  • Loading branch information
edewata committed Feb 15, 2024
1 parent fe19644 commit 9a003fe
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
os:
- 'fedora:latest'
- 'fedora:39'
- 'debian:testing'
- 'ubuntu:rolling'
# Disable CentOS due to missing dependencies
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
sandbox-test:
name: Sandbox Test
runs-on: ubuntu-latest
container: fedora:rawhide
container: fedora:39
steps:
- name: Clone repository
uses: actions/checkout@v3
Expand All @@ -140,8 +140,8 @@ jobs:
- name: Build NSPR and NSS
run: |
cd ..
hg clone https://hg.mozilla.org/projects/nspr
hg clone https://hg.mozilla.org/projects/nss
hg clone https://hg.mozilla.org/projects/nspr -r NSPR_4_35_BRANCH
hg clone https://hg.mozilla.org/projects/nss -r NSS_3_96_BRANCH
cd nss
./build.sh --enable-fips --enable-libpkix
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
#

ARG BASE_IMAGE="registry.fedoraproject.org/fedora:latest"
ARG BASE_IMAGE="registry.fedoraproject.org/fedora:39"
ARG COPR_REPO=""

################################################################################
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
resources:
containers:
# This no longer works for Fedora
# - container: fedora_latest
# image: fedora:latest
# - container: fedora_39
# image: fedora:39
# options: '--name runner -v /usr/bin/docker:/usr/bin/docker:ro'
- container: debian_testing
image: debian:testing
Expand All @@ -19,8 +19,8 @@ jobs:
vmImage: ubuntu-latest
strategy:
matrix:
fedora_latest:
image: registry.fedoraproject.org/fedora:latest
fedora_39:
image: registry.fedoraproject.org/fedora:39
# Disable CentOS due to missing dependencies
# centos_7:
# image: centos:7
Expand Down
2 changes: 1 addition & 1 deletion tests/bin/init-workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ "$BASE64_OS" != "" ]
then
OS_VERSION=$(echo "$BASE64_OS" | base64 -d)
else
OS_VERSION=latest
OS_VERSION=39
fi

BASE_IMAGE=registry.fedoraproject.org/fedora:$OS_VERSION
Expand Down
2 changes: 1 addition & 1 deletion tools/Dockerfiles/stylecheck
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:latest
FROM registry.fedoraproject.org/fedora:39

# Install generic dependencies to check style
RUN true \
Expand Down

0 comments on commit 9a003fe

Please sign in to comment.