Skip to content
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
31 changes: 14 additions & 17 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ permissions:
packages: write

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

jobs:
Expand All @@ -24,20 +21,20 @@ jobs:
FORCE_COLOR: 1
steps:
- uses: actions/checkout@v4

- name: Install Forge
uses: input-output-hk/catalyst-forge/actions/install@ci/v1.5.3
with:
fetch-depth: 0
version: 0.8.0
if: always()

- name: Setup CI
uses: input-output-hk/catalyst-ci/actions/setup@master
with:
aws_role_arn: ${{ env.AWS_ROLE_ARN }}
aws_region: ${{ env.AWS_REGION }}
earthly_runner_secret: ${{ secrets.EARTHLY_RUNNER_SECRET }}
- name: Login to ECR
uses: docker/login-action@v2
with:
registry: ${{ env.ECR_REGISTRY }}
uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.5.3

- name: Run tests
env:
EARTHLY_SECRETS: "IDEASCALE_EMAIL=${{ secrets.IDEASCALE_EMAIL }}, IDEASCALE_PASSWORD=${{ secrets.IDEASCALE_PASSWORD }}, IDEASCALE_API_TOKEN=${{ secrets.IDEASCALE_API_TOKEN }}"
run: |
earthly -P --buildkit-host "tcp://${{ secrets.EARTHLY_SATELLITE_ADDRESS }}:8372" +test-all
uses: input-output-hk/catalyst-forge/actions/run@ci/v1.5.3
if: always()
continue-on-error: true
with:
command: run
args: ./+test-all
12 changes: 2 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ permissions:

jobs:
ci:
uses: input-output-hk/catalyst-ci/.github/workflows/ci.yml@master
uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.5.3
with:
aws_ecr_registry: 332405224602.dkr.ecr.eu-central-1.amazonaws.com
aws_role_arn: arn:aws:iam::332405224602:role/ci
aws_region: eu-central-1
publish_docs: false
secrets:
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
earthly_runner_address: ${{ secrets.EARTHLY_SATELLITE_ADDRESS }}
earthly_runner_secret: ${{ secrets.EARTHLY_RUNNER_SECRET }}
forge_version: 0.8.1
2 changes: 1 addition & 1 deletion docker/voting-node.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM jormungandr:latest as jorm

# stage 3
FROM python as poetry
RUN pip install poetry
RUN pip install poetry==1.8.0

# Add python codebase
COPY . /voting
Expand Down
2 changes: 1 addition & 1 deletion services/voting-node/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ builder:
zlib1g-dev

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

SAVE IMAGE --cache-hint

Expand Down
2 changes: 1 addition & 1 deletion utilities/fragment-exporter/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ deps:
RUN apt-get update && \
apt-get install -y --no-install-recommends curl

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

COPY pyproject.toml .
COPY poetry.lock .
Expand Down
3 changes: 1 addition & 2 deletions utilities/ideascale-importer/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ build:
apt-get install -y --no-install-recommends curl build-essential libxml2-dev libxslt-dev zlib1g-dev python3-lxml

# Install Poetry
RUN curl -sSL https://install.python-poetry.org | python3 -

RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.0
# Set path to poetry
ENV PATH=/root/.local/bin:$PATH

Expand Down
Loading