Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependency in debian package recipe #124

Closed
wants to merge 4 commits into from
Closed

Update dependency in debian package recipe #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8205b4
Add information about v2.20.1 relying on preCICE v3.0.0 in the README
IshaanDesai Mar 21, 2024
2b5802e
Remove last traces of libprecice2 (#123)
IshaanDesai Apr 3, 2024
2e21a72
Bump version, but without changing the folder name
IshaanDesai Apr 5, 2024
1fd2b4d
Bump version number in packaging folder name
IshaanDesai Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ubuntu_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
container: precice/precice:develop
continue-on-error: true
env: # Versioning is "calculix-preciceX_2.YY-Z[...]" with X the major preCICE version, YY the minor CCX version and Z the package version
PACKAGE_NAME: "calculix-precice3_2.20.1-1_amd64"
Comment on lines 22 to -23
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we are only changing the Debian package details, the most appropriate here would be 2.20.1-2. But it probably does not matter anywhere.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this because we are bumping the version and doing a new release. 2.20.1 is the actual adapter version, right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • v2.20: CalculiX version
  • v2.20.1: The second adapter we release that is made for v2.20 (previous was v2.20.0)
  • v2.20.1-1: The first Debian package release (revision) of v2.20.1
  • v2.20.1-2: The second Debian package release (revision) of v2.20.1.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By this logic we should not release. Because we are not changing the adapter, but just a dependency of the Debian package.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would actually prefer that. Let's rename this PR, still merge it, and update the Debian packages in the release with a note, in case the previous ones were broken.

PACKAGE_NAME: "calculix-precice3_2.20.2-1_amd64"

steps:
- name: Update system
Expand All @@ -45,8 +45,8 @@ jobs:
run: sudo apt install lintian pandoc -y
- name: Create Debian Package
run: |
mkdir -p "packaging/calculix-precice3_2.20.1-1_amd64/usr/bin" &&
cp ./bin/ccx_preCICE ./packaging/calculix-precice3_2.20.1-1_amd64/usr/bin/ccx_preCICE &&
mkdir -p "packaging/calculix-precice3_2.20.2-1_amd64/usr/bin" &&
cp ./bin/ccx_preCICE ./packaging/calculix-precice3_2.20.2-1_amd64/usr/bin/ccx_preCICE &&
cd packaging && pwd && bash ./make_deb.sh ${{matrix.name}}
- name: Store Debian package artifact
uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The adapter was initially developed for conjugate heat transfer (CHT) simulations via preCICE by Lucia Cheung in the scope of her master’s thesis [[1]](https://www5.in.tum.de/pub/Cheung2016_Thesis.pdf) in cooperation with [SimScale](https://www.simscale.com/). For running the adapter for CHT simulations refer to this thesis. The adapter was extended to fluid-structure interaction by Alexander Rusch [[2]](https://www.gacm2017.uni-stuttgart.de/registration/Upload/ExtendedAbstracts/ExtendedAbstract_0138.pdf).

The latest version of the adapter is based on **CalculiX version 2.20.**
Legacy versions of the adapter for older versions of CalculiX are supported on various branches. Branches for CalculiX version older than 2.15 require **preCICE v1.x**, whereas newer versions rely on **preCICE v2.x**.
Legacy versions of the adapter for older versions of CalculiX are supported on various branches. Branches for CalculiX version older than 2.15 require **preCICE v1.x**, whereas newer versions rely on **preCICE v2.x**. Releases **v2.20.1** and above rely on **preCICE v3.0.x**.

## Start here

Expand Down
4 changes: 2 additions & 2 deletions ...ix-precice3_2.20.1-1_amd64/DEBIAN/control → ...ix-precice3_2.20.2-1_amd64/DEBIAN/control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Package: calculix-precice3
Version: 2.20.1-1
Version: 2.20.2-1
Source: calculix-precice3
Architecture: amd64
Section: contrib/science
Priority: optional
Maintainer: The preCICE team (precice.org) <info@precice.org>
Depends: libarpack2 (>= 2.1), libblas3 | libblas.so.3, libc6 (>= 2.29), libgcc-s1 (>= 4.0), libgfortran5 (>= 8), libgomp1 (>= 4.9), liblapack3 | liblapack.so.3, libprecice2 (>= 2.0.0), libspooles2.2, libstdc++6 (>= 9), libyaml-cpp0.6 (>= 0.6.2) | libyaml-cpp0.7
Depends: libarpack2 (>= 2.1), libblas3 | libblas.so.3, libc6 (>= 2.29), libgcc-s1 (>= 4.0), libgfortran5 (>= 8), libgomp1 (>= 4.9), liblapack3 | liblapack.so.3, libprecice3 (>= 3.0.0), libspooles2.2, libstdc++6 (>= 9), libyaml-cpp0.6 (>= 0.6.2) | libyaml-cpp0.7
Bugs: https://github.com/precice/calculix-adapter/issues
Description: Official preCICE adapter for CalculiX.
CalculiX is a Finite Element Method solver for structural mechanics.
Expand Down
0 ...usr/share/doc/calculix-precice3/copyright → ...usr/share/doc/calculix-precice3/copyright
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packaging/make_deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/bash

DISTRIBUTION="_$1"
ADAPTER_VERSION="2.20.1"
ADAPTER_VERSION="2.20.2"
PACKAGE_VERSION="1"

PACKAGE_FOLDER="calculix-precice3_$ADAPTER_VERSION-${PACKAGE_VERSION}_amd64"
Expand Down
Loading