Skip to content

Commit 68b12f4

Browse files
committed
build: fix ci
1 parent bc8354d commit 68b12f4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/release_ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: ${{ matrix.python-version == 3.6 }}
3737
run: |
3838
wget https://raw.githubusercontent.com/powerapi-ng/powerapi-ci-env/main/to_36.sh
39-
/bin/bash to_36.sh virtualwatts
39+
/bin/bash to_36.sh powerapi
4040
- name: Cache pip
4141
uses: actions/cache@v2
4242
with:
@@ -164,7 +164,7 @@ jobs:
164164
- name: Convert to python3.6 code
165165
run: |
166166
wget https://raw.githubusercontent.com/powerapi-ng/powerapi-ci-env/main/to_36.sh
167-
/bin/bash to_36.sh virtualwatts
167+
/bin/bash to_36.sh powerapi
168168
- name: Create source package
169169
run: |
170170
mkdir package

Dockerfile-pypy

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ USER powerapi
66

77
COPY --chown=powerapi . /tmp/powerapi
88

9-
RUN cd /tmp/powerapi && \
10-
sed -i 's/ *-> *[[:alnum:]]*Report//g' $(find powerapi/ -name "*.py") && \
11-
sed -i 's/from __future__ import annotations//g' $(find powerapi/ -name "*.py") && \
12-
sed -i 's/python_requires = >= 3\.[0-9]/python_requires = >= 3.6/g' setup.cfg
9+
RUN cd /tmp/powerapi &&\
10+
wget https://raw.githubusercontent.com/powerapi-ng/powerapi-ci-env/main/to_36.sh && \
11+
/bin/bash to_36.sh powerapi
1312

14-
RUN pypy3 -m pip install --user --no-cache-dir "/tmp/powerapi[mongodb, influxdb, opentsdb, prometheus]" && rm -r /tmp/powerapi
13+
RUN pypy3 -m pip install --user --no-cache-dir "/tmp/powerapi[mongodb, influxdb, opentsdb, prometheus]" && \
14+
rm -r /tmp/powerapi
1515

1616
ENTRYPOINT ["/bin/echo", "This Docker image should be used as a base for another image and should not be executed directly."]

0 commit comments

Comments
 (0)