Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/actions/get-artifact-for-stage-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ runs:
if: ${{ inputs.get_from_jfrog == 'true' }}
env:
JF_URL: ${{ inputs.JFROG_PLATFORM_URL }}
JF_ACCESS_TOKEN: ${{ inputs.JFROG_ACCESS_TOKEN }}

- name: Download artifact from JFrog
if: ${{ inputs.get_from_jfrog == 'true' }}
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/dev-workflow-p2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

jobs:
bump-dev-number:
if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
if: ${{ false && github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
uses: ./.github/workflows/bump-version.yml
with:
change: 'bump-dev-num'
secrets: inherit

rebuild-artifacts-with-new-dev-num:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
needs: bump-dev-number
name: Rebuild artifacts with new dev number
uses: ./.github/workflows/build-artifacts.yml
Expand All @@ -28,16 +28,18 @@

upload-to-jfrog:
name: Upload artifacts to JFrog
needs: [
bump-dev-number,
rebuild-artifacts-with-new-dev-num
]
# needs: [
# bump-dev-number,
# rebuild-artifacts-with-new-dev-num
# ]
uses: ./.github/workflows/upload-to-jfrog.yml
with:
version: ${{ needs.bump-dev-number.outputs.new_version }}
version: a
# version: ${{ needs.bump-dev-number.outputs.new_version }}
secrets: inherit

# We don't want the artifacts in JFrog to also exist in Github
delete-artifacts:
if: ${{ false }}
needs: upload-to-jfrog
uses: ./.github/workflows/delete-artifacts.yml

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
1 change: 0 additions & 1 deletion .github/workflows/upload-jfrog-build-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
- uses: jfrog/setup-jfrog-cli@v4
env:
JF_URL: ${{ secrets.JFROG_PLATFORM_URL }}
JF_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }}

- name: Download JFrog build
run: jf rt dl --build python-client/${{ inputs.version }} ${{ vars.JFROG_REPO_NAME }}
Expand Down
39 changes: 22 additions & 17 deletions .github/workflows/upload-to-jfrog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ on:

jobs:
upload-to-jfrog:
permissions:
id-token: write

name: Upload artifacts to JFrog
runs-on: ubuntu-22.04
steps:
Expand All @@ -29,24 +32,26 @@ jobs:
path: artifacts

- name: Set up JFrog credentials
uses: jfrog/setup-jfrog-cli@v3
uses: jfrog/setup-jfrog-cli@v4
env:
JF_URL: ${{ secrets.JFROG_PLATFORM_URL }}
JF_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }}
JF_URL: https://artifact.aerospike.io
with:
oidc-provider-name: gh-dev-test
oidc-audience: aerospike/testing

- name: Upload manylinux builds from arbitrary branches to JFrog generic repo
if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }}
run: jf rt upload "*manylinux*" ${{ vars.JFROG_GENERIC_REPO_NAME }}/${{ github.ref_name }}/
working-directory: artifacts
# - name: Upload manylinux builds from arbitrary branches to JFrog generic repo
# if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }}
# run: jf rt upload "*manylinux*" ${{ vars.JFROG_GENERIC_REPO_NAME }}/${{ github.ref_name }}/
# working-directory: artifacts

- name: Upload passing builds to JFrog PyPI repo
if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }}
# Source path must be in quotes if it contains an asterisk
# https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551
run: jf rt upload --build-name python-client --build-number $NEW_VERSION "artifacts/*" ${{ vars.JFROG_REPO_NAME }}/aerospike/$NEW_VERSION/
env:
NEW_VERSION: ${{ inputs.version }}
# - name: Upload passing builds to JFrog PyPI repo
# if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }}
# # Source path must be in quotes if it contains an asterisk
# # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551
# run: jf rt upload --build-name python-client --build-number $NEW_VERSION "artifacts/*" ${{ vars.JFROG_REPO_NAME }}/aerospike/$NEW_VERSION/
# env:
# NEW_VERSION: ${{ inputs.version }}

- name: Publish build info
if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }}
run: jf rt build-publish python-client ${{ inputs.version }}
# - name: Publish build info
# if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }}
# run: jf rt build-publish python-client ${{ inputs.version }}
1 change: 0 additions & 1 deletion .github/workflows/valgrind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
- uses: jfrog/setup-jfrog-cli@v4
env:
JF_URL: ${{ secrets.JFROG_PLATFORM_URL }}
JF_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }}

- name: Get shortened commit hash of this workflow run
# versioningit commit sha is always 8 chars long it seems
Expand Down
Loading