Skip to content

Fix java_release workflow by removing step without users/with #2067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pyalex merged 3 commits into from
Nov 19, 2021
Merged

Fix java_release workflow by removing step without users/with #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6922b97
Fix java_release workflow by removing step without users/with
achals Nov 18, 2021
fed1794
Fix java unit tests
achals Nov 18, 2021
88c9a98
Fix java unit tests
achals Nov 19, 2021
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
18 changes: 15 additions & 3 deletions .github/workflows/java_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
submodules: 'true'
# pull_request_target runs the workflow in the context of the base repo
# as such actions/checkout needs to be explicit configured to retrieve
# code from the PR.
ref: refs/pull/${{ github.event.pull_request.number }}/merge
submodules: recursive
- name: Lint java
run: make lint-java

Expand All @@ -23,7 +27,11 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
submodules: 'true'
# pull_request_target runs the workflow in the context of the base repo
# as such actions/checkout needs to be explicit configured to retrieve
# code from the PR.
ref: refs/pull/${{ github.event.pull_request.number }}/merge
submodules: recursive
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
Expand Down Expand Up @@ -52,7 +60,11 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
submodules: 'true'
# pull_request_target runs the workflow in the context of the base repo
# as such actions/checkout needs to be explicit configured to retrieve
# code from the PR.
ref: refs/pull/${{ github.event.pull_request.number }}/merge
submodules: recursive
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/java_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,29 @@ jobs:
infra/scripts/download-maven-cache.sh \
--archive-uri ${MAVEN_CACHE} \
--output-dir .
- name: Build and push versioned images
- name: Build image
run: make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${RELEASE_VERSION}
env:
RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }}
VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }}
HIGHEST_SEMVER_TAG: ${{ needs.get-version.outputs.highest_semver_tag }}
- name: Build image
run: make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${RELEASE_VERSION}
- name: Push image
run: make push-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${RELEASE_VERSION}
env:

@pyalex pyalex Nov 19, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what the point to duplicate env here?

@achals achals Nov 19, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The bare env version step up above is breaking the workflow: https://github.com/feast-dev/feast/actions/workflows/java_release.yml

RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }}
VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }}
HIGHEST_SEMVER_TAG: ${{ needs.get-version.outputs.highest_semver_tag }}
- run: |
echo "Only push to latest tag if tag is the highest semver version $HIGHEST_SEMVER_TAG"
if [ "${VERSION_WITHOUT_PREFIX}" = "${HIGHEST_SEMVER_TAG:1}" ]
then
docker tag ${REGISTRY}/${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} ${REGISTRY}/${{ matrix.component }}:latest
docker push ${REGISTRY}/${{ matrix.component }}:latest
fi
env:
RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }}
VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }}
HIGHEST_SEMVER_TAG: ${{ needs.get-version.outputs.highest_semver_tag }}

publish-java-sdk:
container: maven:3.6-jdk-11
Expand Down
3 changes: 1 addition & 2 deletions java/serving/src/main/java/feast/serving/config/RegistryConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.google.cloud.storage.StorageOptions;
import feast.serving.registry.*;
import java.net.URI;
import java.nio.file.Paths;
import java.util.Optional;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -59,7 +58,7 @@ RegistryFile registryFile(FeastProperties feastProperties, ApplicationContext co
return new S3RegistryFile(context.getBean(AmazonS3.class), registryPath);
case "":
case "file":
return new LocalRegistryFile(Paths.get(registryPath));
return new LocalRegistryFile(registryPath);

@woop woop Nov 18, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain this change?

@achals achals Nov 18, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trying to address this error in java unit tests:

Error:  /home/runner/work/feast/feast/java/serving/src/main/java/feast/serving/config/RegistryConfig.java:[62,47] incompatible types: java.nio.file.Path cannot be converted to java.lang.String

@pyalex pyalex Nov 19, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this is bug from my PR #2043, have no idea how it passed tests

default:
throw new RuntimeException("Registry storage %s is unsupported");
}
Expand Down