From 150e31c4dba0c557eb9e962459f2937c68d39325 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Mon, 10 Feb 2025 16:14:37 -0800 Subject: [PATCH 01/21] Update byron-test-build.yml --- .github/workflows/byron-test-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From eb9849d2db0fb1ee16440240f5283192c30e3c84 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Mon, 10 Feb 2025 16:16:55 -0800 Subject: [PATCH 02/21] Update frogbot-scan-and-fix.yml --- .github/workflows/frogbot-scan-and-fix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot-scan-and-fix.yml b/.github/workflows/frogbot-scan-and-fix.yml index c3b8ae4..ffe3428 100644 --- a/.github/workflows/frogbot-scan-and-fix.yml +++ b/.github/workflows/frogbot-scan-and-fix.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: jfrog/frogbot@7fad842cf6ba3d755c2eb86376cce066327b55d1 + - uses: jfrog/frogbot@v2 env: JF_URL: ${{ vars.JF_URL }}/ JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }} From b55de33ff7665704a789f06a367eaaffed0d2440 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 10:08:04 -0800 Subject: [PATCH 03/21] Update frogbot-scan-pr.yml --- .github/workflows/frogbot-scan-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml index 0695ae6..43827e6 100644 --- a/.github/workflows/frogbot-scan-pr.yml +++ b/.github/workflows/frogbot-scan-pr.yml @@ -34,8 +34,8 @@ jobs: # 2. Some projects require creating a frogbot-config.yml file. Read more about it here - https://github.com/jfrog/frogbot/blob/master/docs/frogbot-config.md - uses: jfrog/frogbot@v2 - with: - oidc-provider-name: "byron-juice-shop" + #with: + # oidc-provider-name: "byron-juice-shop" env: JFROG_CLI_LOG_LEVEL: DEBUG # [Mandatory if the two conditions below are met] From d8cc84115d73cb6a7349bfe21494dba1deff3277 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 10:45:59 -0800 Subject: [PATCH 04/21] Update frogbot-scan-pr.yml --- .github/workflows/frogbot-scan-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml index 798d3cb..91fc49f 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 From f61a2951c49027342ae15ae9c3bbaa40ee5680da Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 10:51:37 -0800 Subject: [PATCH 05/21] Update frogbot-scan-pr.yml --- .github/workflows/frogbot-scan-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml index 91fc49f..f4baf4c 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: ${{ 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 From af6bd3a969cb86462beed7aabac532bdb61a35b1 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:17:26 -0800 Subject: [PATCH 06/21] Update frogbot-scan-and-fix.yml --- .github/workflows/frogbot-scan-and-fix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot-scan-and-fix.yml b/.github/workflows/frogbot-scan-and-fix.yml index ffe3428..7f94ab8 100644 --- a/.github/workflows/frogbot-scan-and-fix.yml +++ b/.github/workflows/frogbot-scan-and-fix.yml @@ -19,7 +19,7 @@ jobs: - 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 }} From d228ee752af5c276399146a8089c4228fe950c1d Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:21:52 -0800 Subject: [PATCH 07/21] Update build-publish.yml --- .github/workflows/build-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 06ec1f1..880645d 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -14,7 +14,7 @@ jobs: env: DOCKER_REPO: 'codeninjas-proj-docker-local' IMAGE_NAME: 'my-very-cool-image:${{ github.run_number }}' - JF_URL: https://${{ vars.JF_URL }}/ + JF_URL: ${{ vars.JF_URL }} DOCKER_CLI_EXPERIMENTAL: enabled steps: # Use the specific setup-cli branch @@ -22,7 +22,7 @@ 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 From d5d7b68bd9f1433bb96dc316a18c41a2a9e973ee Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:27:19 -0800 Subject: [PATCH 08/21] Update build-publish.yml --- .github/workflows/build-publish.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 880645d..d8c4b46 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -24,9 +24,7 @@ jobs: env: 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 From 983266dd9f276e394458020bdbdf0d2b3000c03b Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:34:54 -0800 Subject: [PATCH 09/21] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 411c6bd..f686919 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ PyYAML>3.11 -nltk -redis == 4.6.0 \ No newline at end of file +nltk>3.9 +redis == 4.6.0 From a4d8df3d8e03afa1ca7f54d0901dcf0b633d698c Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:40:19 -0800 Subject: [PATCH 10/21] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 366b5ea..304dab9 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', 'nltk>3.9'], ) From 9408dcf3f159c75a474a7505247dd9d64ae96af8 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:58:14 -0800 Subject: [PATCH 11/21] Update frogbot-scan-and-fix.yml --- .github/workflows/frogbot-scan-and-fix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot-scan-and-fix.yml b/.github/workflows/frogbot-scan-and-fix.yml index 7f94ab8..199af0a 100644 --- a/.github/workflows/frogbot-scan-and-fix.yml +++ b/.github/workflows/frogbot-scan-and-fix.yml @@ -22,5 +22,5 @@ jobs: 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 }} From 5fd9551a10a9c78d67c99b54e81baf7eff807943 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 12:13:23 -0800 Subject: [PATCH 12/21] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f686919..c402402 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ PyYAML>3.11 -nltk>3.9 +nltk == 3.9 redis == 4.6.0 From 5c8c65cbec90e94a3d5552fca904cbc761f92073 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 12:36:53 -0800 Subject: [PATCH 13/21] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c402402..52bc25c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ PyYAML>3.11 -nltk == 3.9 +nltk==3.6.5 redis == 4.6.0 From 72a66329fcf9b196ec9eebb9eeb109f955a7a250 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:14:59 -0800 Subject: [PATCH 14/21] Update frogbot-scan-pr.yml --- .github/workflows/frogbot-scan-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot-scan-pr.yml b/.github/workflows/frogbot-scan-pr.yml index f4baf4c..4549d74 100644 --- a/.github/workflows/frogbot-scan-pr.yml +++ b/.github/workflows/frogbot-scan-pr.yml @@ -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 }} From 9419a926ba82420b337e2749bd781790ef5a0670 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:35:08 -0800 Subject: [PATCH 15/21] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 304dab9..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>3.9'], + install_requires=['PyYAML>3.11'], ) From bf4753d0d9649878d2784881876abc7ea45ec3f6 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:35:19 -0800 Subject: [PATCH 16/21] Update requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 52bc25c..a34d3f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ PyYAML>3.11 -nltk==3.6.5 redis == 4.6.0 From 98730f1860d44dc6f1ca0d2ca05b70d609834520 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:36:21 -0800 Subject: [PATCH 17/21] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a34d3f4..dcdd61f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ PyYAML>3.11 -redis == 4.6.0 + From fe9362535d7f9a3195adf1fe46644a9de5877676 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 14:22:51 -0800 Subject: [PATCH 18/21] Update build-publish.yml --- .github/workflows/build-publish.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index d8c4b46..eebf153 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -50,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 From a828caa80cc420e9d8d472aea52277a059c0489e Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Tue, 11 Feb 2025 15:45:56 -0800 Subject: [PATCH 19/21] Update build-publish.yml --- .github/workflows/build-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index eebf153..8839332 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -12,8 +12,8 @@ jobs: build-publish-python: runs-on: ubuntu-latest env: - DOCKER_REPO: 'codeninjas-proj-docker-local' - IMAGE_NAME: 'my-very-cool-image:${{ github.run_number }}' + DOCKER_REPO: 'jfrog-example' + IMAGE_NAME: 'jfrog-example-image:${{ github.run_number }}' JF_URL: ${{ vars.JF_URL }} DOCKER_CLI_EXPERIMENTAL: enabled steps: From a4d3cd5915e903c44214604bcc32f169593148f2 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:29:38 -0800 Subject: [PATCH 20/21] Update build-publish.yml --- .github/workflows/build-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index 8839332..df71ecd 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -64,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_TOKEN }} - name: Setup buildx instance uses: docker/setup-buildx-action@v3 From f51ec5879ccd377b2ef3a8791a254a02069b5d89 Mon Sep 17 00:00:00 2001 From: byron-infomagnus <126528428+byron-infomagnus@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:31:40 -0800 Subject: [PATCH 21/21] Update build-publish.yml --- .github/workflows/build-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index df71ecd..c80ec9e 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -65,7 +65,7 @@ jobs: with: registry: ${{ vars.JF_URL }} username: ${{ vars.JF_USER }} - password: ${{ secrets.JF_TOKEN }} + password: ${{ secrets.JF_ACCESS_TOKEN }} - name: Setup buildx instance uses: docker/setup-buildx-action@v3