Skip to content

Commit ec9733f

Browse files
Remove legacy spec resolution logic
1 parent dddc940 commit ec9733f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+98
-996
lines changed

.github/workflows/docker-build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,4 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v3
1717
- name: Build the Docker image
18-
run: docker build . --file Dockerfile --tag linode/cli:$(date +%s) --build-arg="github_token=$GITHUB_TOKEN"
19-
env:
20-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
run: docker build . --file Dockerfile --tag linode/cli:$(date +%s)

.github/workflows/e2e-suite-windows.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ jobs:
6969

7070
- name: Install the CLI
7171
run: make install
72-
env:
73-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7472

7573
- run: make INTEGRATION_TEST_PATH="${{ inputs.test_path }}" testint
7674
env:

.github/workflows/e2e-suite.yml

Lines changed: 1 addition & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
- dev
2424

2525
jobs:
26-
integration_tests:
26+
integration-tests:
2727
name: Run integration tests on Ubuntu
2828
runs-on: ubuntu-latest
2929
if: github.event_name == 'workflow_dispatch' && inputs.sha != '' || github.event_name == 'push' || github.event_name == 'pull_request'
@@ -101,8 +101,6 @@ jobs:
101101
102102
- name: Install Package
103103
run: make install
104-
env:
105-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
106104

107105
- name: Set LINODE_CLI_TOKEN
108106
run: |
@@ -167,69 +165,3 @@ jobs:
167165
conclusion: process.env.conclusion
168166
});
169167
return result;
170-
171-
notify-slack:
172-
runs-on: ubuntu-latest
173-
needs: [integration_tests]
174-
if: always() && github.repository == 'linode/linode-cli' # Run even if integration tests fail and only on main repository
175-
176-
steps:
177-
- name: Notify Slack
178-
uses: slackapi/slack-github-action@v1.27.0
179-
with:
180-
channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
181-
payload: |
182-
{
183-
"blocks": [
184-
{
185-
"type": "section",
186-
"text": {
187-
"type": "mrkdwn",
188-
"text": ":rocket: *${{ github.workflow }} Completed in: ${{ github.repository }}* :white_check_mark:"
189-
}
190-
},
191-
{
192-
"type": "divider"
193-
},
194-
{
195-
"type": "section",
196-
"fields": [
197-
{
198-
"type": "mrkdwn",
199-
"text": "*Build Result:*\n${{ needs.integration_tests.result == 'success' && ':large_green_circle: Build Passed' || ':red_circle: Build Failed' }}"
200-
},
201-
{
202-
"type": "mrkdwn",
203-
"text": "*Branch:*\n`${{ github.ref_name }}`"
204-
}
205-
]
206-
},
207-
{
208-
"type": "section",
209-
"fields": [
210-
{
211-
"type": "mrkdwn",
212-
"text": "*Commit Hash:*\n<${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|${{ github.sha }}>"
213-
},
214-
{
215-
"type": "mrkdwn",
216-
"text": "*Run URL:*\n<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View Run Details>"
217-
}
218-
]
219-
},
220-
{
221-
"type": "divider"
222-
},
223-
{
224-
"type": "context",
225-
"elements": [
226-
{
227-
"type": "mrkdwn",
228-
"text": "Triggered by: :bust_in_silhouette: `${{ github.actor }}`"
229-
}
230-
]
231-
}
232-
]
233-
}
234-
env:
235-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/nightly-smoke-tests.yml

Lines changed: 2 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,16 @@ on:
44
schedule:
55
- cron: "0 0 * * *"
66
workflow_dispatch:
7-
inputs:
8-
sha:
9-
description: 'Commit SHA to test'
10-
required: false
11-
default: ''
12-
type: string
137

148
jobs:
159
smoke_tests:
16-
if: github.repository == 'linode/linode-cli' || github.event_name == 'workflow_dispatch'
1710
runs-on: ubuntu-latest
1811

1912
steps:
2013
- name: Checkout code
21-
uses: actions/checkout@v4
14+
uses: actions/checkout@v3
2215
with:
23-
fetch-depth: 0
24-
submodules: 'recursive'
25-
ref: ${{ github.event.inputs.sha || github.ref }}
16+
ref: dev
2617

2718
- name: Set up Python
2819
uses: actions/setup-python@v4
@@ -34,73 +25,9 @@ jobs:
3425

3526
- name: Install Linode CLI
3627
run: make install
37-
env:
38-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3928

4029
- name: Run smoke tests
41-
id: smoke_tests
4230
run: |
4331
make smoketest
4432
env:
4533
LINODE_CLI_TOKEN: ${{ secrets.LINODE_TOKEN }}
46-
47-
- name: Notify Slack
48-
if: always() && github.repository == 'linode/linode-cli' # Run even if integration tests fail and only on main repository
49-
uses: slackapi/slack-github-action@v1.26.0
50-
with:
51-
channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
52-
payload: |
53-
{
54-
"blocks": [
55-
{
56-
"type": "section",
57-
"text": {
58-
"type": "mrkdwn",
59-
"text": ":rocket: *${{ github.workflow }} Completed in: ${{ github.repository }}* :white_check_mark:"
60-
}
61-
},
62-
{
63-
"type": "divider"
64-
},
65-
{
66-
"type": "section",
67-
"fields": [
68-
{
69-
"type": "mrkdwn",
70-
"text": "*Build Result:*\n${{ steps.smoke_tests.outcome == 'success' && ':large_green_circle: Build Passed' || ':red_circle: Build Failed' }}"
71-
},
72-
{
73-
"type": "mrkdwn",
74-
"text": "*Branch:*\n`${{ github.ref_name }}`"
75-
}
76-
]
77-
},
78-
{
79-
"type": "section",
80-
"fields": [
81-
{
82-
"type": "mrkdwn",
83-
"text": "*Commit Hash:*\n<${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|${{ github.sha }}>"
84-
},
85-
{
86-
"type": "mrkdwn",
87-
"text": "*Run URL:*\n<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View Run Details>"
88-
}
89-
]
90-
},
91-
{
92-
"type": "divider"
93-
},
94-
{
95-
"type": "context",
96-
"elements": [
97-
{
98-
"type": "mrkdwn",
99-
"text": "Triggered by: :bust_in_silhouette: `${{ github.actor }}`"
100-
}
101-
]
102-
}
103-
]
104-
}
105-
env:
106-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/publish-oci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,3 @@ jobs:
5757
tags: linode/cli:${{ steps.cli_version.outputs.result }},linode/cli:latest
5858
build-args: |
5959
linode_cli_version=${{ steps.cli_version.outputs.result }}
60-
github_token=${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish-pypi.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
- name: Build the package
3131
run: make build
3232
env:
33-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3433
LINODE_CLI_VERSION: ${{ github.event.release.tag_name }}
3534

3635
- name: Publish the release artifacts to PyPI

.github/workflows/remote-release-trigger.yml

Lines changed: 0 additions & 74 deletions
This file was deleted.

.github/workflows/unit-tests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ jobs:
2929

3030
- name: Install Package
3131
run: make install
32-
env:
33-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3432

3533
- name: Run the unit test suite
3634
run: make test
@@ -59,8 +57,6 @@ jobs:
5957
shell: pwsh
6058
run: |
6159
make install
62-
env:
63-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6460
6561
- name: Run the unit test suite
6662
run: make test

.pylintrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,7 @@ disable=raw-checker-failed,
424424
duplicate-code,
425425
too-few-public-methods,
426426
too-many-instance-attributes,
427-
use-symbolic-message-instead,
428-
too-many-positional-arguments
427+
use-symbolic-message-instead
429428

430429
# Enable the message, report, category or checker with the given id(s). You can
431430
# either give multiple identifier separated by comma (,) or put this option

Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ FROM python:3.11-slim AS builder
22

33
ARG linode_cli_version
44

5-
ARG github_token
6-
75
WORKDIR /src
86

97
RUN apt-get update && \
@@ -13,7 +11,7 @@ COPY . .
1311

1412
RUN make requirements
1513

16-
RUN LINODE_CLI_VERSION=$linode_cli_version GITHUB_TOKEN=$github_token make build
14+
RUN LINODE_CLI_VERSION=$linode_cli_version make build
1715

1816
FROM python:3.11-slim
1917

0 commit comments

Comments
 (0)