Skip to content

Commit a558860

Browse files
author
Georgi Petrov
committed
Test new appraoch
1 parent 7f948d8 commit a558860

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

.github/workflows/analysis_workflow.yml

+3-10
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,9 @@ jobs:
3131
outputs:
3232
matrix: ${{ steps.get_tags.outputs.commits }}
3333

34-
cibw_docker_image:
35-
uses: ./.github/workflows/cibw_docker_image.yml
36-
permissions: {packages: write}
37-
with:
38-
cibuildwheel_ver: "2.12.1"
39-
force_update: false
4034

4135
benchmark_commits:
42-
needs: [get_commits_to_benchmark, cibw_docker_image]
36+
needs: [get_commits_to_benchmark]
4337
strategy:
4438
fail-fast: false
4539
matrix:
@@ -49,7 +43,6 @@ jobs:
4943
secrets: inherit
5044
with:
5145
commit: ${{ matrix.commits }}
52-
cibw_image_tag: ${{ needs.cibw_docker_image.outputs.tag }}
5346
run_all_benchmarks: ${{ inputs.run_all_benchmarks || false }}
5447
run_on_pr_head: ${{ github.event_name == 'pull_request_target' }}
5548

@@ -110,7 +103,7 @@ jobs:
110103
needs: [cibw_docker_image]
111104
runs-on: "ubuntu-22.04"
112105
container:
113-
image: quay.io/pypa/manylinux_2_28_x86_64
106+
image: quay.io/pypa/manylinux_2_28_x86_64:latest
114107
services:
115108
mongodb:
116109
image: mongo:4.4
@@ -136,7 +129,7 @@ jobs:
136129
- name: Install deps
137130
run: |
138131
yum update -y
139-
yum install -y zip flex bison krb5-devel cyrus-sasl-devel openssl-devel \
132+
yum install -y zip flex bison gcc-toolset-11-gdb gcc-toolset-10-libatomic-devel krb5-devel cyrus-sasl-devel openssl-devel \
140133
unzip tar epel-release jq wget libcurl-devel python3 \
141134
python3-devel python3-pip perl-IPC-Cmd
142135

.github/workflows/benchmark_commits.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
inputs:
55
run_all_benchmarks: {required: true, type: boolean, description: Run all benchmarks or just the one for the given commit}
66
commit: {required: true, type: string, description: commit hash that will be benchmarked}
7-
cibw_image_tag: {required: true, type: string, description: Linux only. As built by cibw_docker_image.yml workflow}
87
run_on_pr_head: {required: false, default: false, type: boolean, description: Specifies if the benchmark should run on PR head branch}
98
jobs:
109
start_ec2_runner:
@@ -20,7 +19,7 @@ jobs:
2019
always() &&
2120
!cancelled()
2221
runs-on: ${{ needs.start_ec2_runner.outputs.label }}
23-
container: ${{ inputs.cibw_image_tag}}
22+
container: quay.io/pypa/manylinux_2_28_x86_64:latest
2423
env:
2524
# this is potentially overflowing the cache, so should be looked into after we address issue #1057
2625
SCCACHE_GHA_VERSION: ${{vars.SCCACHE_GHA_VERSION || 1}} # Setting this env var enables the caching

.github/workflows/build_steps.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
if: matrix.os == 'linux' && inputs.job_type != 'build-python-wheels'
9393
run: |
9494
yum update -y
95-
yum install -y zip flex bison devtoolset-11-gdb devtoolset-10-libatomic-devel krb5-devel cyrus-sasl-devel openssl-devel \
95+
yum install -y zip flex bison gcc-toolset-11-gdb gcc-toolset-10-libatomic-devel krb5-devel cyrus-sasl-devel openssl-devel \
9696
unzip tar epel-release jq wget libcurl-devel python3 \
9797
python3-devel python3-pip perl-IPC-Cmd
9898

0 commit comments

Comments
 (0)