From 88604d5a15fa5d757c2b5b51e5dc502abb516762 Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Sun, 11 Aug 2024 17:22:06 -0500 Subject: [PATCH 1/5] Leave spec version out of generated netkans --- netkan/netkan/cli/utilities.py | 1 - netkan/netkan/spacedock_adder.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/netkan/netkan/cli/utilities.py b/netkan/netkan/cli/utilities.py index 1b33e6c..702cad8 100644 --- a/netkan/netkan/cli/utilities.py +++ b/netkan/netkan/cli/utilities.py @@ -79,7 +79,6 @@ def analyze_mod(common: SharedArgs, ident: str, download_url: str) -> None: yaml.dump(ModAnalyzer(ident, download_url, common.game(common.game_id or 'KSP')) .get_netkan_properties(), sio) - click.echo('spec_version: v1.18') click.echo(f'identifier: {ident}') click.echo(sio.getvalue()) diff --git a/netkan/netkan/spacedock_adder.py b/netkan/netkan/spacedock_adder.py index 95d6544..b8b55b9 100644 --- a/netkan/netkan/spacedock_adder.py +++ b/netkan/netkan/spacedock_adder.py @@ -139,7 +139,6 @@ def make_spacedock_netkan(self, ident: str, info: Dict[str, Any]) -> Dict[str, A self.__class__.__name__, ident, url, exc_info=exc) vref_props = {'$vref': props.pop('$vref')} if '$vref' in props else {} return { - 'spec_version': 'v1.34', 'identifier': ident, '$kref': f"#/ckan/spacedock/{info.get('id', '')}", **(vref_props), @@ -191,7 +190,6 @@ def make_github_netkan(self, ident: str, gh_repo: Repository, info: Dict[str, An self.__class__.__name__, ident, url, exc_info=exc) vref_props = {'$vref': props.pop('$vref')} if '$vref' in props else {} netkan = { - 'spec_version': 'v1.34', 'identifier': ident, '$kref': f"#/ckan/github/{gh_repo.full_name}", **(vref_props), From 0d5518c7dc36c364df2036a4ded6d2a53d18a715 Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Sun, 11 Aug 2024 17:33:08 -0500 Subject: [PATCH 2/5] Disable coverage again --- .github/workflows/coverage-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage-report.yml b/.github/workflows/coverage-report.yml index 6dc7791..24dd869 100644 --- a/.github/workflows/coverage-report.yml +++ b/.github/workflows/coverage-report.yml @@ -15,7 +15,7 @@ permissions: jobs: coverage-report: runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} + if: false && ${{ github.event.workflow_run.conclusion == 'success' }} steps: - uses: actions/download-artifact@v4 with: From 737d410a1eac6a5ec38018b649b155277a731cf8 Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Sun, 11 Aug 2024 17:36:41 -0500 Subject: [PATCH 3/5] Try false inside the double curly braces --- .github/workflows/coverage-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage-report.yml b/.github/workflows/coverage-report.yml index 24dd869..05320e6 100644 --- a/.github/workflows/coverage-report.yml +++ b/.github/workflows/coverage-report.yml @@ -15,7 +15,7 @@ permissions: jobs: coverage-report: runs-on: ubuntu-latest - if: false && ${{ github.event.workflow_run.conclusion == 'success' }} + if: ${{ false && github.event.workflow_run.conclusion == 'success' }} steps: - uses: actions/download-artifact@v4 with: From c3e95fd42696b03aa1b8e34b5f8248332dc3d9a2 Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Sun, 11 Aug 2024 17:39:31 -0500 Subject: [PATCH 4/5] Just disable the step that's throwing an NRE --- .github/workflows/coverage-report.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/coverage-report.yml b/.github/workflows/coverage-report.yml index 05320e6..aab0392 100644 --- a/.github/workflows/coverage-report.yml +++ b/.github/workflows/coverage-report.yml @@ -15,7 +15,7 @@ permissions: jobs: coverage-report: runs-on: ubuntu-latest - if: ${{ false && github.event.workflow_run.conclusion == 'success' }} + if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - uses: actions/download-artifact@v4 with: @@ -23,6 +23,7 @@ jobs: run-id: ${{ github.event.workflow_run.id }} github-token: ${{ secrets.GITHUB_TOKEN }} - name: Get Cover + if: false uses: techman83/coverage@feat/workflow_run with: coverageFile: coverage.xml From e0a3528b61067065c45f76c3b884c5edd536dbcc Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Sun, 11 Aug 2024 17:41:44 -0500 Subject: [PATCH 5/5] I guess it's only looking at the master branch, go back to disabling the whole job --- .github/workflows/coverage-report.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/coverage-report.yml b/.github/workflows/coverage-report.yml index aab0392..05320e6 100644 --- a/.github/workflows/coverage-report.yml +++ b/.github/workflows/coverage-report.yml @@ -15,7 +15,7 @@ permissions: jobs: coverage-report: runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} + if: ${{ false && github.event.workflow_run.conclusion == 'success' }} steps: - uses: actions/download-artifact@v4 with: @@ -23,7 +23,6 @@ jobs: run-id: ${{ github.event.workflow_run.id }} github-token: ${{ secrets.GITHUB_TOKEN }} - name: Get Cover - if: false uses: techman83/coverage@feat/workflow_run with: coverageFile: coverage.xml