Skip to content

Commit 1b894f5

Browse files
authored
Remove install steps from abi-diff workflow for compat with new runner image (#59)
1 parent 270d3d0 commit 1b894f5

1 file changed

Lines changed: 11 additions & 37 deletions

File tree

.github/workflows/abi-diff.yml

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@ on:
55
os:
66
type: string
77
default: ubuntu-22.04
8-
compiler:
8+
cc:
99
type: string
10-
default: clang-17
11-
cmake-version:
10+
default: clang-20
11+
cxx:
1212
type: string
13-
default: 3.21.7
14-
conan-version:
15-
type: string
16-
default: 1.62.0
13+
default: clang++-20
1714

1815
# Branch to compare to
1916
base-branch:
@@ -54,31 +51,8 @@ jobs:
5451
shell: bash
5552
runs-on: ${{ inputs.os }}
5653
steps:
57-
- name: Add repos for for gcc-13 and clang-16,17
58-
uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/setup_apt@main
59-
60-
- name: Get minimum cmake version
61-
uses: lukka/get-cmake@v3.29.6
62-
with:
63-
cmakeVersion: ${{ inputs.cmake-version }}
64-
65-
- name: Install compiler
66-
id: install_cc
67-
uses: rlalik/setup-cpp-compiler@v1.2
68-
with:
69-
compiler: ${{ inputs.compiler }}
70-
71-
- name: Install conan
72-
uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/configure_conan@main
73-
with:
74-
conan-version: ${{ inputs.conan-version }}
75-
76-
- name: Add conan remotes
54+
- name: Conan login
7755
run: |
78-
conan remote add dice-group https://conan.dice-research.org/artifactory/api/conan/tentris
79-
conan remote login -p "${{ secrets.CONAN_PW }}" dice-group "${{ secrets.CONAN_USER }}"
80-
81-
conan remote add tentris-private https://conan.dice-research.org/artifactory/api/conan/tentris-private
8256
conan remote login -p "${{ secrets.CONAN_PW }}" tentris-private "${{ secrets.CONAN_USER }}"
8357
8458
- name: Cache conan data
@@ -125,15 +99,15 @@ jobs:
12599
- name: Generate version file on feature branch
126100
uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/generate_version_file@main
127101
with:
128-
cc: ${{ steps.install_cc.outputs.cc }}
129-
cxx: ${{ steps.install_cc.outputs.cxx }}
102+
cc: ${{ inputs.cc }}
103+
cxx: ${{ inputs.cxx }}
130104
build-dir: build_dir
131105
target: ${{ inputs.abi-version-cmake-target }}
132106

133107
- name: Fetch current ABI version
134108
id: current-abi-version
135109
run: |
136-
${{ steps.install_cc.outputs.cxx }} -std=c++20 -I. -o /tmp/detect-abi-version-current /tmp/detect-abi-version.cpp
110+
${{ inputs.cxx }} -std=c++20 -I. -o /tmp/detect-abi-version-current /tmp/detect-abi-version.cpp
137111
abi_version=$(/tmp/detect-abi-version-current)
138112
139113
echo "Current ABI version: $abi_version"
@@ -147,15 +121,15 @@ jobs:
147121
- name: Regenerate version file for base branch
148122
uses: dice-group/cpp-conan-release-reusable-workflow/.github/actions/generate_version_file@main
149123
with:
150-
cc: ${{ steps.install_cc.outputs.cc }}
151-
cxx: ${{ steps.install_cc.outputs.cxx }}
124+
cc: ${{ inputs.cc }}
125+
cxx: ${{ inputs.cxx }}
152126
build-dir: build_dir
153127
target: ${{ inputs.abi-version-cmake-target }}
154128

155129
- name: Fetch base branch ABI version
156130
id: base-abi-version
157131
run: |
158-
${{ steps.install_cc.outputs.cxx }} -std=c++20 -I. -o /tmp/detect-abi-version-base /tmp/detect-abi-version.cpp
132+
${{ inputs.cxx }} -std=c++20 -I. -o /tmp/detect-abi-version-base /tmp/detect-abi-version.cpp
159133
abi_version=$(/tmp/detect-abi-version-base)
160134
161135
echo "Base ABI version: $abi_version"

0 commit comments

Comments
 (0)