Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
24 changes: 13 additions & 11 deletions .github/workflows/build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,19 @@ jobs:
build-publish-python:
runs-on: ubuntu-latest
env:
DOCKER_REPO: 'codeninjas-proj-docker-local'
IMAGE_NAME: 'my-very-cool-image:${{ github.run_number }}'
JF_URL: https://${{ vars.JF_URL }}/
DOCKER_REPO: 'jfrog-example'
IMAGE_NAME: 'jfrog-example-image:${{ github.run_number }}'
JF_URL: ${{ vars.JF_URL }}
DOCKER_CLI_EXPERIMENTAL: enabled
steps:
# Use the specific setup-cli branch
- name: Setup JFrog CLI
uses: jfrog/setup-jfrog-cli@v4
id: setup-cli
env:
JF_URL: https://${{ vars.JF_URL }}/
JF_URL: ${{ vars.JF_URL }}
JF_PROJECT: ${{ vars.JF_PROJECT }}
with:
oidc-provider-name: jfrog-github-oidc

JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }}
- name: Checkout the repository
uses: actions/checkout@v4

Expand All @@ -52,8 +50,12 @@ jobs:

- name: publish python package
run: |
jf rt u dist/ codeninjas-proj-python-virtual/example-projects/ --module=jfrog-python-example

jf rt u dist/ byron-py-pypi/ --module=jfrog-python-example
- name: Publish Build info With JFrog CLI
run: |
jf rt build-collect-env
jf rt build-add-git
jf rt build-publish

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand All @@ -62,8 +64,8 @@ jobs:
uses: docker/login-action@v3
with:
registry: ${{ vars.JF_URL }}
username: ${{ steps.setup-cli.outputs.oidc-user }}
password: ${{ steps.setup-cli.outputs.oidc-token }}
username: ${{ vars.JF_USER }}
password: ${{ secrets.JF_ACCESS_TOKEN }}

- name: Setup buildx instance
uses: docker/setup-buildx-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/byron-test-build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Tag Docker Image
name: Byron Build and Tag Docker Image

on:
push:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/frogbot-scan-and-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: jfrog/frogbot@7fad842cf6ba3d755c2eb86376cce066327b55d1
- uses: jfrog/frogbot@v2
env:
JF_URL: ${{ vars.JF_URL }}/
JF_URL: ${{ vars.JF_URL }}
JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }}
JF_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JF_PROJECT: ${{ vars.JF_PROJECT }}
#JF_PROJECT: ${{ vars.JF_PROJECT }}
JF_GIT_BASE_BRANCH: ${{ matrix.branch }}
4 changes: 2 additions & 2 deletions .github/workflows/frogbot-scan-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

# [Mandatory]
# JFrog platform URL
JF_URL: https://${{ vars.JF_URL }}/
JF_URL: ${{ vars.JF_URL }}

# [Mandatory if JF_USER and JF_PASSWORD are not provided]
# JFrog access token with 'read' permissions on Xray service
Expand Down Expand Up @@ -76,4 +76,4 @@ jobs:
# dependencies from a virtual repository in Artifactory, set the name of of the repository. There's no
# need to set this value, if it is set in the frogbot-config.yml file.
# JF_DEPS_REPO: ""
JF_PROJECT: ${{ vars.JF_PROJECT }}
#JF_PROJECT: ${{ vars.JF_PROJECT }}
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
PyYAML>3.11
nltk
redis == 4.6.0

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
author_email='jfrog@jfrog.com',
url='https://github.com/carmithersh/carmit-testing',
packages=['pythonExample'],
install_requires=['PyYAML>3.11', 'nltk'],
install_requires=['PyYAML>3.11'],
)
Loading