Skip to content

Commit 3c1c8cd

Browse files
authored
chore: Migrate-ci-to-forge | NPG-000 (#733)
# Description Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change. Fixes # (issue) _if applicable_ ## Type of change Please delete options that are not relevant. - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update ## How Has This Been Tested? Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration - [ ] Test A - [ ] Test B **Test Configuration**: _if applicable_ - Firmware version: - Hardware: - Toolchain: - SDK: **List of new dependencies**: _if applicable_ Provide a list of newly added dependencies in this PR, with the description of what are they doing and why do we need them. - Crate A: description - Crate B: description ## Checklist - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
1 parent 5312962 commit 3c1c8cd

File tree

6 files changed

+20
-32
lines changed

6 files changed

+20
-32
lines changed

.github/workflows/ci-test.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ permissions:
1111
packages: write
1212

1313
env:
14-
AWS_REGION: eu-central-1
15-
AWS_ROLE_ARN: arn:aws:iam::332405224602:role/ci
16-
ECR_REGISTRY: 332405224602.dkr.ecr.eu-central-1.amazonaws.com
1714
TAG: ${{ github.sha }}
1815

1916
jobs:
@@ -24,20 +21,20 @@ jobs:
2421
FORCE_COLOR: 1
2522
steps:
2623
- uses: actions/checkout@v4
24+
25+
- name: Install Forge
26+
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.5.3
2727
with:
28-
fetch-depth: 0
28+
version: 0.8.0
29+
if: always()
30+
2931
- name: Setup CI
30-
uses: input-output-hk/catalyst-ci/actions/setup@master
31-
with:
32-
aws_role_arn: ${{ env.AWS_ROLE_ARN }}
33-
aws_region: ${{ env.AWS_REGION }}
34-
earthly_runner_secret: ${{ secrets.EARTHLY_RUNNER_SECRET }}
35-
- name: Login to ECR
36-
uses: docker/login-action@v2
37-
with:
38-
registry: ${{ env.ECR_REGISTRY }}
32+
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.5.3
33+
3934
- name: Run tests
40-
env:
41-
EARTHLY_SECRETS: "IDEASCALE_EMAIL=${{ secrets.IDEASCALE_EMAIL }}, IDEASCALE_PASSWORD=${{ secrets.IDEASCALE_PASSWORD }}, IDEASCALE_API_TOKEN=${{ secrets.IDEASCALE_API_TOKEN }}"
42-
run: |
43-
earthly -P --buildkit-host "tcp://${{ secrets.EARTHLY_SATELLITE_ADDRESS }}:8372" +test-all
35+
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.3
36+
if: always()
37+
continue-on-error: true
38+
with:
39+
command: run
40+
args: ./+test-all

.github/workflows/ci.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ permissions:
1010

1111
jobs:
1212
ci:
13-
uses: input-output-hk/catalyst-ci/.github/workflows/ci.yml@master
13+
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.5.3
1414
with:
15-
aws_ecr_registry: 332405224602.dkr.ecr.eu-central-1.amazonaws.com
16-
aws_role_arn: arn:aws:iam::332405224602:role/ci
17-
aws_region: eu-central-1
18-
publish_docs: false
19-
secrets:
20-
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
21-
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
22-
earthly_runner_address: ${{ secrets.EARTHLY_SATELLITE_ADDRESS }}
23-
earthly_runner_secret: ${{ secrets.EARTHLY_RUNNER_SECRET }}
15+
forge_version: 0.8.1

docker/voting-node.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM jormungandr:latest as jorm
88

99
# stage 3
1010
FROM python as poetry
11-
RUN pip install poetry
11+
RUN pip install poetry==1.8.0
1212

1313
# Add python codebase
1414
COPY . /voting

services/voting-node/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ builder:
2121
zlib1g-dev
2222

2323
# Install Poetry
24-
RUN curl -sSL https://install.python-poetry.org | python3 -
24+
RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.0
2525

2626
SAVE IMAGE --cache-hint
2727

utilities/fragment-exporter/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ deps:
1111
RUN apt-get update && \
1212
apt-get install -y --no-install-recommends curl
1313

14-
RUN curl -sSL https://install.python-poetry.org | python3 -
14+
RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.0
1515

1616
COPY pyproject.toml .
1717
COPY poetry.lock .

utilities/ideascale-importer/Earthfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ build:
1515
apt-get install -y --no-install-recommends curl build-essential libxml2-dev libxslt-dev zlib1g-dev python3-lxml
1616

1717
# Install Poetry
18-
RUN curl -sSL https://install.python-poetry.org | python3 -
19-
18+
RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.0
2019
# Set path to poetry
2120
ENV PATH=/root/.local/bin:$PATH
2221

0 commit comments

Comments
 (0)