mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-26 07:00:17 -05:00
Keep ubuntu-24.04 for the main build workflow
This commit is contained in:
1 parent
10ecec9fb2
commit
2bdc35ef68
3 files changed
+13
-8
No files matched your search
@@ -37,8 +37,8 @@ jobs:
|
||||
ri-unit-test-path: "ApplicationLibCode/UnitTests/ResInsight-tests",
|
||||
}
|
||||
- {
|
||||
name: "Ubuntu 26.04 gcc",
|
||||
os: ubuntu-26.04,
|
||||
name: "Ubuntu 24.04 gcc",
|
||||
os: ubuntu-24.04,
|
||||
cc: "gcc-14",
|
||||
cxx: "g++-14",
|
||||
build-python-module: true,
|
||||
@@ -53,8 +53,8 @@ jobs:
|
||||
ri-unit-test-path: "ApplicationLibCode/UnitTests/ResInsight-tests",
|
||||
}
|
||||
- {
|
||||
name: "Ubuntu 26.04 clang-19",
|
||||
os: ubuntu-26.04,
|
||||
name: "Ubuntu 24.04 clang-19",
|
||||
os: ubuntu-24.04,
|
||||
cc: "clang-19",
|
||||
cxx: "clang++-19",
|
||||
build-python-module: true,
|
||||
@@ -165,6 +165,11 @@ jobs:
|
||||
run: |
|
||||
set -e
|
||||
|
||||
# Add LLVM repository
|
||||
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
|
||||
echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main" | sudo tee /etc/apt/sources.list.d/llvm-19.list
|
||||
echo "deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main" | sudo tee -a /etc/apt/sources.list.d/llvm-19.list
|
||||
|
||||
# Update package list and install clang-19
|
||||
sudo apt-get update --option="APT::Acquire::Retries=3"
|
||||
sudo apt-get install --option="APT::Acquire::Retries=3" -y \
|
||||
@@ -368,7 +373,7 @@ jobs:
|
||||
pypi-publish:
|
||||
name: Upload release to PyPI
|
||||
needs: build
|
||||
runs-on: ubuntu-26.04
|
||||
runs-on: ubuntu-24.04
|
||||
environment:
|
||||
name: pypi
|
||||
url: https://pypi.org/p/rips
|
||||
|
||||
@@ -75,7 +75,7 @@ jobs:
|
||||
cd artifacts
|
||||
for d in ResInsight-*/; do
|
||||
name="${d%/}"
|
||||
# Spaces in artifact names (e.g. "ResInsight-Ubuntu 26.04 gcc")
|
||||
# Spaces in artifact names (e.g. "ResInsight-Ubuntu 24.04 gcc")
|
||||
# make awkward asset filenames, so collapse them to underscores.
|
||||
safe="${name// /_}"
|
||||
zip -r "../release-assets/${safe}-${{ github.ref_name }}.zip" "$name"
|
||||
|
||||
@@ -50,9 +50,9 @@ jobs:
|
||||
per_page: 100,
|
||||
});
|
||||
|
||||
const artifact = artifacts.find((candidate) => candidate.name === "ResInsight-Ubuntu 26.04 gcc");
|
||||
const artifact = artifacts.find((candidate) => candidate.name === "ResInsight-Ubuntu 24.04 gcc");
|
||||
if (!artifact) {
|
||||
core.setFailed("Could not find artifact 'ResInsight-Ubuntu 26.04 gcc' on selected run");
|
||||
core.setFailed("Could not find artifact 'ResInsight-Ubuntu 24.04 gcc' on selected run");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user