diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 06ec1f1..c80ec9e 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -12,9 +12,9 @@ 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 @@ -22,11 +22,9 @@ jobs: 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 @@ -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 @@ -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 diff --git a/.github/workflows/byron-test-build.yml b/.github/workflows/byron-test-build.yml index ce5d9b6..3680b07 100644 --- a/.github/workflows/byron-test-build.yml +++ b/.github/workflows/byron-test-build.yml @@ -1,4 +1,4 @@ -name: Build and Tag Docker Image +name: Byron Build and Tag Docker Image on: push: diff --git a/.github/workflows/frogbot-scan-and-fix.yml b/.github/workflows/frogbot-scan-and-fix.yml index c3b8ae4..199af0a 100644 --- a/.github/workflows/frogbot-scan-and-fix.yml +++ b/.github/workflows/frogbot-scan-and-fix.yml @@ -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 }} diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml index 798d3cb..4549d74 100644 --- a/.github/workflows/frogbot-scan-pr.yml +++ b/.github/workflows/frogbot-scan-pr.yml @@ -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 @@ -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 }} diff --git a/requirements.txt b/requirements.txt index 411c6bd..dcdd61f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ PyYAML>3.11 -nltk -redis == 4.6.0 \ No newline at end of file + diff --git a/setup.py b/setup.py index 366b5ea..6bbc88f 100644 --- a/setup.py +++ b/setup.py @@ -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'], )