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.

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

GHA deprecation fixes #1624

Merged
merged 9 commits into from
Dec 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ RUN apt-get update -y && apt-get install -y \
RUN pip3 install -U \
# Required by setup.py
setuptools==50.3.2 \
'pyzmq==22.3.0'\
# Linting tools
pep8==1.7.1 \
pep8-naming==0.6.1 \
Expand All @@ -78,4 +79,4 @@ RUN pip3 install -U \
# install rake
RUN gem install --no-document rake
## install fpm; needs to be pinned to 1.13.1 because some packages cannot be built with the newest release 1.14.0
RUN gem install --no-document fpm -v 1.13.1
RUN gem install --no-document fpm -v 1.14.2
2 changes: 1 addition & 1 deletion .github/workflows/build/Dockerfile.ubuntu-2004
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ RUN pip3 install -U \
# install rake
RUN gem install --no-document rake
## install fpm; needs to be pinned to 1.13.1 because some packages cannot be built with the newest release 1.14.0
RUN gem install --no-document fpm -v 1.13.1
RUN gem install --no-document fpm -v 1.14.2

RUN apt-get -y autoremove \
&& rm -rf /var/lib/apt/lists/*
4 changes: 2 additions & 2 deletions .github/workflows/reuseable_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:

- name: Publish Test Report
if: success() || failure()
uses: scacap/action-surefire-report@v1.0.7
uses: scacap/action-surefire-report@v1
continue-on-error: true
with:
check_name: Indy Plenum ${{ matrix.module }} Test Report for slice ${{ matrix.slice }}/${{ strategy.job-total }}
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
run: python3 -m pytest -l -vv --junitxml=test-result-plenum-${{ matrix.module }}.xml ${{ matrix.module }}

- name: Publish Test Report
uses: scacap/action-surefire-report@v1.0.7
uses: scacap/action-surefire-report@v1
continue-on-error: true
with:
check_name: Indy Plenum ${{ matrix.module }} Test Report
Expand Down
5 changes: 3 additions & 2 deletions .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gitpod/workspace-full as base
FROM gitpod/workspace-base:2022-12-09-04-00-52 as base

USER gitpod

Expand Down Expand Up @@ -65,9 +65,10 @@ RUN pip3 install -U \
# Linting tools
pep8==1.7.1 \
pep8-naming==0.6.1 \
'pyzmq==22.3.0'\
flake8==3.8.4

# install rake
RUN sudo gem install --no-document rake
## install fpm; needs to be pinned to 1.13.1 because some packages cannot be built with the newest release 1.14.0
RUN sudo gem install --no-document fpm -v 1.13.1
RUN sudo gem install --no-document fpm -v 1.14.2
2 changes: 1 addition & 1 deletion build-scripts/ubuntu-2004/build-3rd-parties.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ build_from_pypi leveldb
build_from_pypi libnacl 1.6.1
build_from_pypi msgpack-python
build_from_pypi orderedset
build_from_pypi packaging
build_from_pypi packaging 21.3
build_from_pypi portalocker
build_from_pypi prompt-toolkit 3.0.18
build_from_pypi psutil
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
exec(f.read(), metadata)

tests_require = ['attrs==20.3.0', 'pytest==6.2.2', 'pytest-xdist==2.2.1', 'pytest-forked==1.3.0',
'python3-indy==1.15.0-dev-1625', 'pytest-asyncio==0.14.0']
'python3-indy==1.16.0.post236', 'pytest-asyncio==0.14.0']


class PyZMQCommand(distutils.cmd.Command):
Expand Down Expand Up @@ -156,4 +156,4 @@ def run(self):
'scripts/init_bls_keys',
'scripts/process_logs/process_logs',
'scripts/process_logs/process_logs.yml']
)
)