From fcd2d9ded6f1d5dacb8fd10172fa9f4ffd2bbde8 Mon Sep 17 00:00:00 2001 From: Tom Morrell Date: Mon, 6 May 2024 16:06:32 -0700 Subject: [PATCH 1/5] add codemeta2cff to iga workflow --- .github/workflows/iga.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/iga.yml b/.github/workflows/iga.yml index 90d4aab..c61c337 100644 --- a/.github/workflows/iga.yml +++ b/.github/workflows/iga.yml @@ -50,10 +50,22 @@ on: run-name: Archive ${{inputs.release_tag || 'latest release'}} in InvenioRDM jobs: + CodeMeta2CFF: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Convert CFF + uses: caltechlibrary/codemeta2cff@main + - name: Commit CFF + uses: EndBug/add-and-commit@v9 + with: + message: 'Add CITATION.cff for release' + add: "['CITATION.cff']" run_iga: - name: Send to ${{needs.get_repository.outputs.server}} + name: "Send to ${{needs.get_repository.outputs.server}}" runs-on: ubuntu-latest - needs: get_repository + needs: [get_repository, CodeMeta2CFF] steps: - uses: caltechlibrary/iga@main with: @@ -67,11 +79,10 @@ jobs: parent_record: ${{github.event.inputs.parent_record || env.parent_record}} release_tag: ${{github.event.inputs.release_tag || 'latest'}} get_repository: - name: Get repository name + name: "Get repository name" runs-on: ubuntu-latest outputs: server: ${{steps.parse.outputs.host}} steps: - - name: Extract name from INVENIO_SERVER - id: parse + - id: parse run: echo "host=$(cut -d'/' -f3 <<< ${{env.INVENIO_SERVER}} | cut -d':' -f1)" >> $GITHUB_OUTPUT From e29f3d67ba904d20bbb4bfa1b62c472b60ac32cb Mon Sep 17 00:00:00 2001 From: Tom Morrell Date: Mon, 6 May 2024 16:07:55 -0700 Subject: [PATCH 2/5] Update codemeta.json w release and copyright --- codemeta.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/codemeta.json b/codemeta.json index 80954f0..ada58cd 100644 --- a/codemeta.json +++ b/codemeta.json @@ -4,8 +4,8 @@ "name": "Caltech Library Software Repository Template", "identifier": "template", "description": "Template repository for software projects by the Caltech Library", - "version": "1.32.0", - "datePublished": "2024-02-21", + "version": "1.33.0", + "datePublished": "2024-05-06", "dateCreated": "2019-07-23", "author": [ { @@ -63,7 +63,7 @@ "name": "California Institute of Technology" } ], - "copyrightYear": 2024, + "copyrightYear": "2024", "license": "https://github.com/caltechlibrary/template/blob/main/LICENSE", "isAccessibleForFree": true, "url": "https://github.com/caltechlibrary/template", From 80ae2a797d25481f8503872fe7400da61209344c Mon Sep 17 00:00:00 2001 From: Tom Morrell Date: Mon, 6 May 2024 16:08:55 -0700 Subject: [PATCH 3/5] Delete .github/workflows/codemeta2cff.yml --- .github/workflows/codemeta2cff.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .github/workflows/codemeta2cff.yml diff --git a/.github/workflows/codemeta2cff.yml b/.github/workflows/codemeta2cff.yml deleted file mode 100644 index 3d7cb99..0000000 --- a/.github/workflows/codemeta2cff.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: CodeMeta2CFF -run-name: Run CodeMeta2CFF after ${{github.event_name}} by ${{github.actor}} - -on: - push: - tags: - - v* - workflow_dispatch: - inputs: - reason: - description: Reason - required: false - default: Manual trigger - -jobs: - CodeMeta2CFF: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Convert CFF - uses: caltechlibrary/codemeta2cff@main - - name: Commit CFF - uses: EndBug/add-and-commit@v9 - with: - message: Add CITATION.cff for release - add: CITATION.cff From b0a1a50e0c45dfb9de0408d1c5ed5be241cce662 Mon Sep 17 00:00:00 2001 From: Tom Morrell Date: Mon, 6 May 2024 16:10:34 -0700 Subject: [PATCH 4/5] Update iga.yml --- .github/workflows/iga.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/iga.yml b/.github/workflows/iga.yml index c61c337..d909ede 100644 --- a/.github/workflows/iga.yml +++ b/.github/workflows/iga.yml @@ -63,7 +63,7 @@ jobs: message: 'Add CITATION.cff for release' add: "['CITATION.cff']" run_iga: - name: "Send to ${{needs.get_repository.outputs.server}}" + name: Send to ${{needs.get_repository.outputs.server}} runs-on: ubuntu-latest needs: [get_repository, CodeMeta2CFF] steps: @@ -79,10 +79,11 @@ jobs: parent_record: ${{github.event.inputs.parent_record || env.parent_record}} release_tag: ${{github.event.inputs.release_tag || 'latest'}} get_repository: - name: "Get repository name" + name: Get repository name runs-on: ubuntu-latest outputs: server: ${{steps.parse.outputs.host}} steps: - - id: parse + - name: Extract name from INVENIO_SERVER + id: parse run: echo "host=$(cut -d'/' -f3 <<< ${{env.INVENIO_SERVER}} | cut -d':' -f1)" >> $GITHUB_OUTPUT From 1aac3c1bda36a4f3fcba0407a854c8e2bbc4d7e1 Mon Sep 17 00:00:00 2001 From: Tom Morrell Date: Mon, 6 May 2024 16:17:56 -0700 Subject: [PATCH 5/5] Update iga.yml --- .github/workflows/iga.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/iga.yml b/.github/workflows/iga.yml index d909ede..8c4729c 100644 --- a/.github/workflows/iga.yml +++ b/.github/workflows/iga.yml @@ -60,7 +60,7 @@ jobs: - name: Commit CFF uses: EndBug/add-and-commit@v9 with: - message: 'Add CITATION.cff for release' + message: Add CITATION.cff for release add: "['CITATION.cff']" run_iga: name: Send to ${{needs.get_repository.outputs.server}}