Skip to content

chore: update ubuntu 20.04 to ubuntu-latest and actions/cache to v4 #675

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
8 changes: 4 additions & 4 deletions .github/build-cpp-filecoin.src.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
## You should `pre-commit install` or use `pre-commit-hook.sh`,
## anyway please read .github/README.md
check_workflow_yaml_coressponds_to_src_yaml:
runs-on: ubuntu-20.04 #ubuntu-latest
runs-on: ubuntu-latest
#container: ubuntu:latest ## This is required as barrier between AWS-hosted runners and GitHub-hosted runners - they have different set of software, so run in container
name: Check if github workflows were properly made from sources
steps:
@@ -48,7 +48,7 @@ jobs:
## Note: image is push only when DockerHub login-token pair available - not to PRs from forks.
Docker-fuhon-builder:
needs: check_workflow_yaml_coressponds_to_src_yaml
runs-on: ubuntu-20.04 #ubuntu-latest #[ self-hosted, Linux ]
runs-on: ubuntu-latest #[ self-hosted, Linux ]
env: &env_dockerhub
DOCKERHUB_ORG: soramitsu ## Cannot use ${{ secrets.DOCKERHUB_ORG }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -128,7 +128,7 @@ jobs:
uses: docker/setup-buildx-action@v1
- &step_docker_cache
name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{env.dockertag}}
@@ -190,4 +190,4 @@ jobs:
## if dockertag is already pushed then use it. But let it be empty when tag does not exist remotely.
dockertag: ${{steps.dockertag.outputs.dockertag}}
container: ${{steps.dockertag_already.outputs.container}}
pushed: ${{ steps.docker_login.outcome == 'success' && steps.build_and_push.outcome == 'success' }}
pushed: ${{ steps.docker_login.outcome == 'success' && steps.build_and_push.outcome == 'success' }}
4 changes: 2 additions & 2 deletions .github/workflows/asan.yml
Original file line number Diff line number Diff line change
@@ -10,14 +10,14 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
name: checkout repo
- name: cache
uses: actions/cache@v1.2.0
uses: actions/cache@v4
env:
cache-name: cache-filecoin-ffi-proofs
version: v28
6 changes: 3 additions & 3 deletions .github/workflows/build-cpp-filecoin.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
## You should `pre-commit install` or use `pre-commit-hook.sh`,
## anyway please read .github/README.md
check_workflow_yaml_coressponds_to_src_yaml:
runs-on: ubuntu-20.04 #ubuntu-latest
runs-on: ubuntu-latest
#container: ubuntu:latest ## This is required as barrier between AWS-hosted runners and GitHub-hosted runners - they have different set of software, so run in container
name: Check if github workflows were properly made from sources
steps:
@@ -43,7 +43,7 @@ jobs:
## Note: image is push only when DockerHub login-token pair available - not to PRs from forks.
Docker-fuhon-builder:
needs: check_workflow_yaml_coressponds_to_src_yaml
runs-on: ubuntu-20.04 #ubuntu-latest #[ self-hosted, Linux ]
runs-on: ubuntu-latest #[ self-hosted, Linux ]
env:
DOCKERHUB_ORG: soramitsu ## Cannot use ${{ secrets.DOCKERHUB_ORG }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -127,7 +127,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{env.dockertag}}
20 changes: 9 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -15,14 +15,12 @@ jobs:
fail-fast: false
matrix:
# 3 jobs in total
os: [ ubuntu-20.04, macOS-latest ]
compiler: [ {
"cc": "gcc",
"cxx": "g++"
}, {
"cc": "clang",
"cxx": "clang++"
} ]
os: [ ubuntu-latest, macOS-latest ]
compiler:
- cc: gcc
cxx: g++
- cc: clang
cxx: clang++
exclude:
- os: macOS-latest
compiler:
@@ -42,7 +40,7 @@ jobs:
submodules: 'recursive'
name: checkout repo
- name: cache
uses: actions/cache@v1.2.0
uses: actions/cache@v4
env:
cache-name: cache-filecoin-ffi-proofs
version: v28
@@ -59,12 +57,12 @@ jobs:
sudo apt-get update
sudo apt-get install -y ninja-build python-setuptools pkg-config ocl-icd-* opencl-headers libhwloc-dev libhidapi-dev
fi

pip3 -V || sudo python3 -m pip install --upgrade pip
sudo pip3 install scikit-build
sudo pip3 install requests gitpython gcovr pyyaml
sudo curl https://sh.rustup.rs -sSf | sh -s -- -y

# Workaround to provide additional free space for testing.
# https://github.com/actions/virtual-environments/issues/2875
sudo rm -rf /usr/share/dotnet
4 changes: 2 additions & 2 deletions .github/workflows/lsan.yml
Original file line number Diff line number Diff line change
@@ -10,14 +10,14 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
name: checkout repo
- name: cache
uses: actions/cache@v1.2.0
uses: actions/cache@v4
env:
cache-name: cache-filecoin-ffi-proofs
version: v28
3 changes: 1 addition & 2 deletions .github/workflows/tsan.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
submodules: 'recursive'
name: checkout repo
- name: cache
uses: actions/cache@v1.2.0
uses: actions/cache@v4
env:
cache-name: cache-filecoin-ffi-proofs
version: v28
@@ -45,4 +45,3 @@ jobs:
CTEST_OUTPUT_ON_FAILURE: 1
TSAN_OPTIONS: "suppressions=${{ github.workspace }}/.github/workflows/tsan-ignorelist.txt"
run: cmake --build build --target test

4 changes: 2 additions & 2 deletions .github/workflows/ubsan.yml
Original file line number Diff line number Diff line change
@@ -10,14 +10,14 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
name: checkout repo
- name: cache
uses: actions/cache@v1.2.0
uses: actions/cache@v4
env:
cache-name: cache-filecoin-ffi-proofs
version: v28