From 09acbf956cca48d7ebbd7baa8543ecab7f3858c3 Mon Sep 17 00:00:00 2001 From: Matt Watson Date: Wed, 7 Sep 2022 10:33:02 -0700 Subject: [PATCH] Try fixing the build --- .cloudbuild/cloudbuild.yaml | 4 ++-- .cloudbuild/requirements.txt | 4 ++-- .github/workflows/actions.yml | 6 ++---- .github/workflows/nightly.yml | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml index 2c104be121..ca088aa9df 100644 --- a/.cloudbuild/cloudbuild.yaml +++ b/.cloudbuild/cloudbuild.yaml @@ -13,7 +13,7 @@ steps: args: [ 'build', '.', - '-f', 'cloudbuild/Dockerfile', + '-f', '.cloudbuild/Dockerfile', '-t', '$_IMAGE_NAME:$BUILD_ID', ] - name: 'docker' @@ -44,7 +44,7 @@ steps: - clone-templates entrypoint: 'jsonnet' args: [ - 'cloudbuild/unit_test_jobs.jsonnet', + '.cloudbuild/unit_test_jobs.jsonnet', '--string', '-J', 'ml-testing-accelerators', '--ext-str', 'image=$_IMAGE_NAME', diff --git a/.cloudbuild/requirements.txt b/.cloudbuild/requirements.txt index f426d23969..cbd1586d2d 100644 --- a/.cloudbuild/requirements.txt +++ b/.cloudbuild/requirements.txt @@ -1,8 +1,8 @@ absl-py numpy packaging -tensorflow -tensorflow-text +tensorflow==2.9 +tensorflow-text==2.9 black flake8 isort diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index cd852986b2..5c53e31beb 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -32,8 +32,7 @@ jobs: ${{ runner.os }}-pip- - name: Install dependencies run: | - pip install tensorflow - pip install -e ".[tests]" --progress-bar off --upgrade + pip install -e ".[tests]" tensorflow==2.9 --progress-bar off --upgrade - name: Test with pytest run: | pytest --cov=keras_nlp --cov-report xml:coverage.xml @@ -60,7 +59,6 @@ jobs: ${{ runner.os }}-pip- - name: Install dependencies run: | - pip install tensorflow - pip install -e ".[tests]" --progress-bar off --upgrade + pip install -e ".[tests]" tensorflow==2.9 --progress-bar off --upgrade - name: Lint run: bash shell/lint.sh diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7ff9404820..e8503bec53 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -33,7 +33,7 @@ jobs: ${{ runner.os }}-pip- - name: Install dependencies run: | - pip install -e ".[tests]" --progress-bar off --upgrade + pip install -e ".[tests]" tensorflow==2.9 --progress-bar off --upgrade pip uninstall keras -y pip uninstall tensorflow -y pip uninstall tensorflow_text -y