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

feat: DEVOPS-700 scilla pipelines from jenkins to gha #1237

Merged
merged 45 commits into from
Jun 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
e48360a
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 15, 2023
0194559
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 15, 2023
18377c9
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
231a4c4
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
331eee2
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
e3c42a7
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
ee40f62
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
53b7c41
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
16c20ef
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
268d1d9
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
62ea87d
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
8a22b8a
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
540d715
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
c641c7a
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
4e974a9
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
6fd2867
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
9710123
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
035352c
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
cb9e225
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
fdcddd7
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
7ddf4e4
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
d2f7c75
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
1a0d01a
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
d14122a
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 19, 2023
8e7039f
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
f929448
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
c4c217c
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
2c7ad58
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
8c60ad8
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
999d115
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
5326f3a
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
d7ecac9
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
c10bfa2
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
db56f93
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
92996eb
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
b534d45
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
b280589
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
f1c48c5
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
0b43063
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
cb65bcd
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
d594780
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
49704bd
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
e632e8c
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
58cf4af
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
bee1459
feat: DEVOPS-700 scilla pipelines from jenkins to gha
pavlops Jun 20, 2023
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
45 changes: 45 additions & 0 deletions .github/workflows/ci-image-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: CI - Development

on:
workflow_dispatch:
inputs:
commitOrTag:
description: 'Commit or tag'
required: false
default: ''
push:
branches-ignore:
- 'release/**'

jobs:
push-to-ecr:
permissions:
id-token: write
contents: write
name: build
runs-on: docker
steps:
- name: Clean environment
# Prune the Docker resources created over 10 days before the current execution (change the value for a more/less aggressive cleanup).
shell: bash
run: |
docker system df
docker system prune -a -f --filter "until=168h"
docker system df
- name: 'Checkout scm ${{ inputs.commitOrTag }}'
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ inputs.commitOrTag }}
- name: Docker build and push
uses: Zilliqa/gh-actions-workflows/actions/ci-dockerized-app-build-push@v1
with:
file: docker/Dockerfile
push: true
tag: ${{ secrets.AWS_ACCOUNT_ID_ZILLIQA }}.dkr.ecr.${{ secrets.AWS_REGION_ZILLIQA }}.amazonaws.com/scilla
tag-length: 8
registry: ${{ secrets.AWS_ACCOUNT_ID_ZILLIQA }}.dkr.ecr.${{ secrets.AWS_REGION_ZILLIQA }}.amazonaws.com
aws-region: ${{ secrets.AWS_REGION_ZILLIQA }}
role-to-assume: ${{ secrets.ECR_DEPLOYER_ROLE }}
oidc-role: ${{ secrets.OIDC_ROLE }}
cache-key: ${{ github.event.repository.name }}
66 changes: 66 additions & 0 deletions .github/workflows/ci-image-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: CI - Release

on:
workflow_dispatch:
inputs:
commitOrTag:
description: 'Commit or tag'
required: false
default: ''
push:
tags:
- v*

jobs:
release-image:
permissions:
id-token: write
contents: write
runs-on: docker
steps:
- name: 'Checkout scm ${{ inputs.commitOrTag }}'
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ inputs.commitOrTag }}
- name: Check if the commit or tag was passed manually
id: set-tag
run: |
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
echo "tag=$(git rev-parse HEAD | cut -c1-8)" >> $GITHUB_OUTPUT
else
echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT
fi
shell: bash
- name: Check if the tag head is the same as master head
id: check-latest
if: github.event_name != 'workflow_dispatch'
run: |
if test $(git rev-parse origin/master) = $(git rev-parse HEAD); then
echo "latest=true" >> $GITHUB_OUTPUT
else
echo "latest=false" >> $GITHUB_OUTPUT
fi
shell: bash
- name: Docker build and push
uses: Zilliqa/gh-actions-workflows/actions/ci-dockerized-app-build-push@v1
with:
file: docker/Dockerfile
push: true
tag: ${{ secrets.AWS_ACCOUNT_ID_ZILLIQA }}.dkr.ecr.${{ secrets.AWS_REGION_ZILLIQA }}.amazonaws.com/scilla:${{ steps.set-tag.outputs.tag }}
tag-latest: ${{ steps.check-latest.outputs.latest }}
registry: ${{ secrets.AWS_ACCOUNT_ID_ZILLIQA }}.dkr.ecr.${{ secrets.AWS_REGION_ZILLIQA }}.amazonaws.com
aws-region: ${{ secrets.AWS_REGION_ZILLIQA }}
role-to-assume: ${{ secrets.ECR_DEPLOYER_ROLE }}
oidc-role: ${{ secrets.OIDC_ROLE }}
cache-key: ${{ github.event.repository.name }}
- name: Docker build and push (Dockerhub)
uses: Zilliqa/gh-actions-workflows/actions/ci-dockerized-app-build-push@v1
with:
file: docker/Dockerfile
push: true
tag: Zilliqa/scilla:${{ steps.set-tag.outputs.tag }}
tag-latest: ${{ steps.check-latest.outputs.latest }}
cache-key: ${{ github.event.repository.name }}
registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
registry-password: ${{ secrets.DOCKERHUB_PASSWORD }}
63 changes: 63 additions & 0 deletions .github/workflows/ci-image-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: CI - Integration tests

on:
workflow_dispatch:
inputs:
commitOrTag:
description: 'Commit or tag'
required: false
default: ''
pull_request:
branches:
- 'master'

jobs:
run-tests:
permissions:
id-token: write
contents: write
name: tests
runs-on: docker
steps:
- name: Clean environment
# Prune the Docker resources created over 10 days before the current execution (change the value for a more/less aggressive cleanup).
shell: bash
run: |
docker system df
docker system prune -a -f --filter "until=336h"
docker system df
- name: 'Checkout scm ${{ inputs.commitOrTag }}'
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ inputs.commitOrTag }}
- name: Configure AWS Credentials
uses: Zilliqa/gh-actions-workflows/actions/configure-aws-credentials@v1
with:
role-to-assume: ${{ secrets.ECR_DEPLOYER_ROLE }}
oidc-role: ${{ secrets.OIDC_ROLE }}
aws-region: ${{ secrets.AWS_REGION_ZILLIQA }}
- name: Login to the registry
uses: docker/login-action@v2
with:
registry: ${{ secrets.AWS_ACCOUNT_ID_ZILLIQA }}.dkr.ecr.${{ secrets.AWS_REGION_ZILLIQA }}.amazonaws.com
- name: Build Docker images
run: |
DOCKER_BUILDKIT=1 docker build -t scilla:tests --build-arg ACCOUNT_ID=${{ secrets.AWS_ACCOUNT_ID_ZILLIQA }} -f docker/Dockerfile.test .
shell: bash
- name: Run make test
run: |
docker run --rm -i scilla:tests bash -c 'eval $(opam env) && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib make test'
shell: bash
- name: Run make test_server
run: |
docker run --rm -i scilla:tests bash -c 'eval $(opam env) && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib make test_server'
shell: bash
- name: Run make coveralls
run: |
docker run --rm -i scilla:tests bash -c 'eval $(opam env) && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib make coveralls TRAVIS_JOB_ID=${{ github.run_number }}'
shell: bash
- name: Run make lint
run: |
docker run --rm -i scilla:tests bash -c 'eval $(opam env) && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib make lint'
shell: bash
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ clean:
dune clean
# Remove remaining files/folders ignored by git as defined in .gitignore (-X)
# but keeping a local opam switch and other dependencies built.
git clean -dfXq --exclude=\!deps/** --exclude=\!_opam/** --exclude=\!_esy/** --exclude=\!vcpkg_installed
git clean -dfXq --exclude=\!deps/** --exclude=\!_opam/** --exclude=\!_esy/** --exclude=\!vcpkg_installed --exclude=\!vcpkg_installed/**

# Clean up libff installation
cleanall: clean
Expand Down
17 changes: 17 additions & 0 deletions docker/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ARG ACCOUNT_ID

FROM ${ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/scilla:429e2f9

ENV VCPKG_ROOT="/vcpkg"
ENV SCILLA_REPO_ROOT="/scilla/0"

WORKDIR /scilla/0/
COPY . /scilla/0/

RUN apt update \
&& apt install -y sudo

RUN eval $(opam env) \
&& LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib opam install reason.3.8.2 --yes

RUN ./scripts/install_shellcheck_ubuntu.sh
4 changes: 3 additions & 1 deletion src/base/cpp/config/discover.ml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ let () =
We rely on a simple python program (in vcpkg_cmd) to do so portably.
*)
let vcpkg_cmd =
"python3 -c 'import os, sys; print(os.path.realpath(os.environ[\"SCILLA_REPO_ROOT\"]" ^^ "+\"/%s\"))'"
"python3 -c 'import os, sys; \
print(os.path.realpath(os.environ[\"SCILLA_REPO_ROOT\"]"
^^ "+\"/%s\"))'"
in
let vcpkg_triplet_path =
input_line
Expand Down