Skip to content

Commit e98709f

Browse files
authored
No subscription (#4)
* updates
1 parent 007626a commit e98709f

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

README.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- uses: deislabs/hyperlight-workflow-setup@dev
1515
with:
1616
rust-toolchain: "1.74.0"
17-
env:
18-
PAT: $ {{ secrets.ADO_CARGO_RO_PAT }}
17+
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
18+
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
1919
```
2020
2121
## Inputs
@@ -25,17 +25,15 @@ jobs:
2525
| Name | Description |
2626
| ---- | ----------- |
2727
| `rust-toolchain` | The rust toolchain version to use. |
28-
29-
### Environment Variables
30-
31-
| Name | Description |
32-
| ---- | ----------- |
33-
| `PAT` | The Personal Access Token to use for logging into the Hyperlight cargo feeds in Azure DevOps. |
28+
| `azure-client-id` | The Azure Client ID to use for logging into the Hyperlight cargo feeds in Azure DevOps. |
29+
| `azure-tenant-id` | The Azure Tenant ID to use for logging into the Hyperlight cargo feeds in Azure DevOps. |
3430

3531
## Overview
3632

3733
This action performs the following steps:
3834

35+
- Logs into the Azure account using the provided client ID and tenant ID.
36+
- The account used to log in must be configred for OIDC authentication from GitHub workflows.
3937
- Runs `cargo login` to log into the Hyperlight cargo feeds in Azure DevOps.
4038
- Installs the Rust tool chain at the specified version.
4139
- Installs additional rust components like clippy, rustfmt, ect

action.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ inputs:
1414
azure-tenant-id:
1515
description: 'TenantId of the Azure Service principal created.'
1616
required: true
17-
azure-subscription-id:
18-
description: 'Azure subscriptionId'
19-
required: false
2017

2118
runs:
2219
using: composite
@@ -42,17 +39,12 @@ runs:
4239
shell: bash
4340

4441
- name: Azure CLI login (Linux)
45-
uses: azure/login@v1
42+
uses: azure/login@v2
4643
if: runner.os == 'Linux'
4744
with:
4845
client-id: ${{ inputs.azure-client-id }}
4946
tenant-id: ${{ inputs.azure-tenant-id }}
50-
subscription-id: ${{ inputs.azure-subscription-id }}
51-
52-
- name: Cargo login
53-
if: ${{ runner.os == 'Linux' }}
54-
run: just cargo-login
55-
shell: bash
47+
allow-no-subscriptions: true
5648

5749
- name: Cargo login
5850
if: ${{ runner.os == 'Linux' }}
@@ -115,12 +107,12 @@ runs:
115107
### Windows setup ###
116108

117109
- name: Azure CLI login (Window)
118-
uses: azure/login@v1
110+
uses: azure/login@v2
119111
if: runner.os == 'Windows'
120112
with:
121113
client-id: ${{ inputs.azure-client-id }}
122114
tenant-id: ${{ inputs.azure-tenant-id }}
123-
subscription-id: ${{ inputs.azure-subscription-id }}
115+
allow-no-subscriptions: true
124116

125117
- name: Cargo login (Windows)
126118
if: ${{ (runner.os == 'Windows') }}

0 commit comments

Comments
 (0)