Skip to content

Commit

Permalink
[MERGE][2024.6]Reverted w/a with hardcoded paths #329 (#341)
Browse files Browse the repository at this point in the history
* remove w/a

* Revert "remove w/a"

This reverts commit 51ecf3f.

* Reverted w/a with hardcoded paths (#329)

* test provider fix

* fix

* latest_available_commit

* Update .github/workflows/linux.yml

Co-authored-by: Alina Kladieva <[email protected]>

* revert container w/a

* Revert "Merge branch 'provider_container_fix' of https://github.com/mryzhov/openvino_tokenizers_public into provider_container_fix"

This reverts commit 0ce8c73, reversing
changes made to 53eccc8.

---------

Co-authored-by: Alina Kladieva <[email protected]>

---------

Co-authored-by: Alina Kladieva <[email protected]>
  • Loading branch information
mryzhov and akladiev authored Dec 6, 2024
1 parent 26c5ec0 commit da2aaf0
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,17 @@ jobs:
runs-on: aks-linux-2-cores-8gb
container:
image: 'openvinogithubactions.azurecr.io/openvino_provider:0.1.0'
volumes: [ "/mount:/mount" ]
volumes:
- /mount:/mount
- ${{ github.workspace }}:${{ github.workspace }}

steps:
- uses: openvinotoolkit/openvino/.github/actions/openvino_provider@master
id: openvino_download
with:
platform: 'ubuntu22'
commit_packages_to_provide: 'wheels'
revision: 'latest_available_commit'
revision: latest_available_commit

- name: Clone docker tag from OpenVINO repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down Expand Up @@ -77,16 +79,16 @@ jobs:
runs-on: aks-linux-8-cores-16gb
container:
image: openvinogithubactions.azurecr.io/ov_build/ubuntu_22_04_x64:${{ needs.openvino_download.outputs.docker_tag }}
volumes:
volumes:
- /mount:/mount
- ${{ github.workspace }}:${{ github.workspace }}
env:
CMAKE_GENERATOR: 'Ninja'
GITHUB_WORKSPACE: /__w/openvino_tokenizers/openvino_tokenizers
OPENVINO_REPO: /__w/openvino_tokenizers/openvino_tokenizers/openvino
INSTALL_DIR: /__w/openvino_tokenizers/openvino_tokenizers/openvino/install
OV_TOKENIZERS_INSTALL_DIR: /__w/openvino_tokenizers/openvino_tokenizers/openvino_tokenizers/install
OPENVINO_TOKENIZERS_REPO: /__w/openvino_tokenizers/openvino_tokenizers/openvino_tokenizers
BUILD_DIR: /__w/openvino_tokenizers/openvino_tokenizers/openvino_tokenizers/build
OPENVINO_REPO: ${{ github.workspace }}/openvino
INSTALL_DIR: ${{ github.workspace }}/openvino/install
OV_TOKENIZERS_INSTALL_DIR: ${{ github.workspace }}/openvino_tokenizers/install
OPENVINO_TOKENIZERS_REPO: ${{ github.workspace }}/openvino_tokenizers
BUILD_DIR: ${{ github.workspace }}/openvino_tokenizers/build

steps:
- name: Clone Openvino tokenizers
Expand Down Expand Up @@ -156,14 +158,14 @@ jobs:
runs-on: aks-linux-4-cores-16gb
container:
image: openvinogithubactions.azurecr.io/ov_build/ubuntu_22_04_x64:${{ needs.openvino_download.outputs.docker_tag }}
volumes:
volumes:
- /mount:/mount
- ${{ github.workspace }}:${{ github.workspace }}
env:
GITHUB_WORKSPACE: /__w/openvino_tokenizers/openvino_tokenizers
OPENVINO_REPO: /__w/openvino_tokenizers/openvino_tokenizers/openvino
INSTALL_DIR: /__w/openvino_tokenizers/openvino_tokenizers/openvino/install
OPENVINO_TOKENIZERS_REPO: /__w/openvino_tokenizers/openvino_tokenizers/openvino_tokenizers
BUILD_DIR: /__w/openvino_tokenizers/openvino_tokenizers/openvino_tokenizers/build
OPENVINO_REPO: ${{ github.workspace }}/openvino
INSTALL_DIR: ${{ github.workspace }}/openvino/install
OPENVINO_TOKENIZERS_REPO: ${{ github.workspace }}/openvino_tokenizers
BUILD_DIR: ${{ github.workspace }}/openvino_tokenizers/build

steps:
- name: Clone Openvino tokenizers
Expand Down

0 comments on commit da2aaf0

Please sign in to comment.