Skip to content

Commit

Permalink
Updating actions
Browse files Browse the repository at this point in the history
  • Loading branch information
davidhjp01 committed Feb 14, 2024
1 parent a2296f9 commit 5481151
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci-conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ jobs:
option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False']
option_shared: ['shared=True', 'shared=False']
timeout-minutes: 35
env:
DOCKER_CONAN_HOME: /tmp/conan2

steps:
- uses: actions/checkout@v4
Expand All @@ -28,7 +26,6 @@ jobs:
ENV CONAN_LOGIN_USERNAME_OSP=${{ secrets.osp_artifactory_usr }}
ENV CONAN_PASSWORD_OSP=${{ secrets.osp_artifactory_pwd }}
ENV LIBCOSIM_RUN_TESTS_ON_CONAN_BUILD=1
ENV CONAN_HOME=${{ env.DOCKER_CONAN_HOME }}
COPY entrypoint.sh /
ENTRYPOINT /entrypoint.sh
EOF
Expand All @@ -38,7 +35,6 @@ jobs:
#!/bin/bash -v
set -eu
cd /mnt/source
conan profile detect -f
conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
REFNAME="${GITHUB_REF#refs/*/}"
VERSION="v$(<version.txt)"
Expand All @@ -63,7 +59,7 @@ jobs:
run: docker build -t osp-builder /tmp/osp-builder-docker/
- name: Build cosim
run: |
docker run --rm --env GITHUB_REF="$GITHUB_REF" -v $(pwd):/mnt/source:ro -v ~/.conan2:${{ env.DOCKER_CONAN_HOME }} -u root osp-builder
docker run --rm --env GITHUB_REF="$GITHUB_REF" -v $(pwd):/mnt/source:ro osp-builder
windows:
Expand All @@ -90,7 +86,7 @@ jobs:
pip3 install conan
- name: Configure Conan
run: |
conan profile detect -f
conan profile detect
conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
- name: Conan create
shell: bash
Expand Down

0 comments on commit 5481151

Please sign in to comment.