Skip to content

Add cos #138

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
loispostula merged 2 commits into from
Sep 4, 2024
Merged

Add cos #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1d035f
feat: login to cos
loispostula Sep 4, 2024
9b1ab34
feat: add confi of build-workflow-version
loispostula Sep 4, 2024
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
17 changes: 16 additions & 1 deletion .github/actions/login-private-registry/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ inputs:
additional_private_keys:
default: ""
description: "Additional private keys to add to the ssh-agent"
cos_username:
default: ""
description: "Username to connect to cos"
cos_password:
default: ""
description: "Password to connect to cos"
cos_tenant:
default: ""
description: "Tenant to connect to cos"
host:
default: ""
description: "DEPRECATED"
Expand Down Expand Up @@ -56,10 +65,16 @@ runs:
echo " insteadOf = https://github.com/orica-digital" >> $HOME/.gitconfig
echo '[url "ssh://git@github.com/orica-digital"]' >> $HOME/.gitconfig
echo " insteadOf = https://git@github.com/orica-digital" >> $HOME/.gitconfig
- name: Login to private registry
- name: Login to shipyard private registry
shell: bash
run: cargo login --registry ${{ inputs.name }} ${{ inputs.token }}

- name: Login to orica cosmos private registry
shell: bash
if: inputs.cos_username != '' && inputs.cos_password != '' && inputs.cos_tenant != ''
run:
az login --service-principal --username ${{ inputs.cos_username }} --password ${{ inputs.cos_password }} --tenant ${{ inputs.cos_tenant }}
az account get-access-token --query "join(' ', ['Bearer', accessToken])" --output tsv | cargo login --registry cos
- name: Login to our private npm registry
uses: actions/setup-node@v4
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/docker_publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,15 @@ jobs:
with:
toolchain: ${{ inputs.toolchain }}

- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v2
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v3.2.0
with:
private_key: ${{ secrets.CARGO_PRIVATE_REGISTRY_SSH_PRIVATE_KEY }}
host: ${{ secrets.CARGO_PRIVATE_REGISTRY_HOST }}
name: ${{ secrets.CARGO_PRIVATE_REGISTRY_NAME }}
token: ${{ secrets.CARGO_PRIVATE_REGISTRY_TOKEN }}
cos_username: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_USERNAME }}
cos_password: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_PASSWORD }}
cos_tenant: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_TENANT }}
additional_private_keys: |
${{ secrets.OREPROLIB_SSH_PRIVATE_KEY }}
${{ secrets.SPARKL_BLAST_SSH_PRIVATE_KEY }}
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/npm_napi_publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,15 @@ jobs:
- name: Git checkout
uses: actions/checkout@v4

- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v2
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v3.2.0
with:
private_key: ${{ secrets.CARGO_PRIVATE_REGISTRY_SSH_PRIVATE_KEY }}
host: ${{ secrets.CARGO_PRIVATE_REGISTRY_HOST }}
name: ${{ secrets.CARGO_PRIVATE_REGISTRY_NAME }}
token: ${{ secrets.CARGO_PRIVATE_REGISTRY_TOKEN }}
cos_username: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_USERNAME }}
cos_password: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_PASSWORD }}
cos_tenant: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_TENANT }}

- name: Build rust package
uses: ForesightMiningSoftwareCorporation/github/.github/actions/build-napi-artifact@v3.0.0
Expand Down Expand Up @@ -129,12 +132,15 @@ jobs:
run: yarn artifacts
working-directory: ${{ inputs.working_directory }}

- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v2
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v3.2.0
with:
private_key: ${{ secrets.CARGO_PRIVATE_REGISTRY_SSH_PRIVATE_KEY }}
host: ${{ secrets.CARGO_PRIVATE_REGISTRY_HOST }}
name: ${{ secrets.CARGO_PRIVATE_REGISTRY_NAME }}
token: ${{ secrets.CARGO_PRIVATE_REGISTRY_TOKEN }}
cos_username: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_USERNAME }}
cos_password: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_PASSWORD }}
cos_tenant: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_TENANT }}

- name: Publish
id: publish
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/rust-update-dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,16 @@ jobs:
with:
app_id: ${{ secrets.UPDATECLIBOT_APP_ID }}
private_key: ${{ secrets.UPDATECLIBOT_APP_PRIVKEY }}
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v1
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v3.2.0
if: steps.check_exists.outputs.exists != 'true'
with:
private_key: ${{ secrets.CARGO_PRIVATE_REGISTRY_SSH_PRIVATE_KEY }}
host: ${{ secrets.CARGO_PRIVATE_REGISTRY_HOST }}
name: ${{ secrets.CARGO_PRIVATE_REGISTRY_NAME }}
token: ${{ secrets.CARGO_PRIVATE_REGISTRY_TOKEN }}
cos_username: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_USERNAME }}
cos_password: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_PASSWORD }}
cos_tenant: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_TENANT }}
- name: Run UpdateCli Autodiscovery
shell: bash
run: |
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/rust_binary_publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,15 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ inputs.toolchain }}
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v1
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v3.2.0
with:
private_key: ${{ secrets.CARGO_PRIVATE_REGISTRY_SSH_PRIVATE_KEY }}
host: ${{ secrets.CARGO_PRIVATE_REGISTRY_HOST }}
name: ${{ secrets.CARGO_PRIVATE_REGISTRY_NAME }}
token: ${{ secrets.CARGO_PRIVATE_REGISTRY_TOKEN }}
cos_username: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_USERNAME }}
cos_password: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_PASSWORD }}
cos_tenant: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_TENANT }}
additional_private_keys: |
${{ secrets.FSE_SSH_PRIVATE_KEY }}
${{ secrets.BEVY_CLIPMAP_SSH_PRIVATE_KEY }}
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/rust_registry_publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,16 @@ jobs:
shell: bash
run: |
cargo login ${{ secrets.CARGO_PUBLIC_REGISTRY_TOKEN }}
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v1
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v3.2.0
if: inputs.public_release != 'true'
with:
private_key: ${{ secrets.CARGO_PRIVATE_REGISTRY_SSH_PRIVATE_KEY }}
host: ${{ secrets.CARGO_PRIVATE_REGISTRY_HOST }}
name: ${{ secrets.CARGO_PRIVATE_REGISTRY_NAME }}
token: ${{ secrets.CARGO_PRIVATE_REGISTRY_TOKEN }}
cos_username: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_USERNAME }}
cos_password: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_PASSWORD }}
cos_tenant: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_TENANT }}
additional_private_keys: |
${{ secrets.FSE_SSH_PRIVATE_KEY }}
${{ secrets.VOLUMESIGHT_SSH_PRIVATE_KEY }}
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/rust_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,15 @@ jobs:
rustup set auto-self-update disable
- name: Checkout
uses: actions/checkout@v4
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v1
- uses: ForesightMiningSoftwareCorporation/github/.github/actions/login-private-registry@v3.2.0
with:
private_key: ${{ secrets.CARGO_PRIVATE_REGISTRY_SSH_PRIVATE_KEY }}
host: ${{ secrets.CARGO_PRIVATE_REGISTRY_HOST }}
name: ${{ secrets.CARGO_PRIVATE_REGISTRY_NAME }}
token: ${{ secrets.CARGO_PRIVATE_REGISTRY_TOKEN }}
cos_username: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_USERNAME }}
cos_password: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_PASSWORD }}
cos_tenant: ${{ secrets.CARGO_COS_PRIVATE_REGISTRY_TENANT }}
additional_private_keys: |
${{ secrets.FSE_SSH_PRIVATE_KEY }}
${{ secrets.BEVY_CLIPMAP_SSH_PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_release_workflows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
else
template_option=""
fi
fslabscli generate-release-workflow --test-publish-required-disabled --fslabscli-version ${{ vars.FSLABSCLI_VERSION }} ${template_option}
fslabscli generate-release-workflow --test-publish-required-disabled --fslabscli-version ${{ vars.FSLABSCLI_VERSION }} --build-workflow-version ${{ vars.BUILD_WORKFLOW_VERSION }} ${template_option}
- id: generate_wix_files
name: Generate release wix files
shell: bash
Expand Down