From c486f1cab900022c45c75432e8cc868c7bad512f Mon Sep 17 00:00:00 2001 From: Nicola Rustignoli Date: Tue, 4 Feb 2025 09:35:26 +0100 Subject: [PATCH] Update actions (#93) * Automatic update of .gitignore * Automatic update of Makefile * Remove old .github/workflows/ghpages.yml * update gitignore * Automatic update of .gitignore * Automatic update of .github/workflows/ghpages.yml * Automatic update of .github/workflows/publish.yml * Automatic update of .github/workflows/archive.yml * Automatic update of .github/CODEOWNERS --- .github/CODEOWNERS | 2 +- .github/workflows/archive.yml | 4 +++- .github/workflows/ghpages.yml | 4 +++- .github/workflows/publish.yml | 4 ++-- .gitignore | 4 ++-- Makefile | 10 +++++++--- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 40a20b8..bef8844 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ # Automatically generated CODEOWNERS # Regenerate with `make update-codeowners` -draft-dekater-scion-dataplane.md c_de_kater@gmx.ch nic@scion.org hitz@anapaya.net +draft-dekater-scion-dataplane.md c_de_kater@gmx.ch nic@scion.org jch@scion.org hitz@anapaya.net diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml index 19d125f..5f5d47d 100644 --- a/.github/workflows/archive.yml +++ b/.github/workflows/archive.yml @@ -16,6 +16,8 @@ jobs: build: name: "Archive Issues and Pull Requests" runs-on: ubuntu-latest + permissions: + contents: write steps: - name: "Checkout" uses: actions/checkout@v4 @@ -37,6 +39,6 @@ jobs: token: ${{ github.token }} - name: "Save Archive" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: archive.json diff --git a/.github/workflows/ghpages.yml b/.github/workflows/ghpages.yml index ed9b441..f6cb64d 100644 --- a/.github/workflows/ghpages.yml +++ b/.github/workflows/ghpages.yml @@ -18,6 +18,8 @@ jobs: build: name: "Update Editor's Copy" runs-on: ubuntu-latest + permissions: + contents: write steps: - name: "Checkout" uses: actions/checkout@v4 @@ -51,7 +53,7 @@ jobs: token: ${{ github.token }} - name: "Archive Built Drafts" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: | draft-*.html diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1d567c5..94d885f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -49,9 +49,9 @@ jobs: with: make: upload env: - UPLOAD_EMAIL: ${{ inputs.email }} + UPLOAD_EMAIL: ${{ inputs.email }} - name: "Archive Submitted Drafts" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: "versioned/draft-*-[0-9][0-9].*" diff --git a/.gitignore b/.gitignore index 77b563b..7a00f59 100644 --- a/.gitignore +++ b/.gitignore @@ -5,11 +5,12 @@ *.txt *.upload *~ +.DS_Store .tags /*-[0-9][0-9].xml +/.*.mk /.gems/ /.refcache -/.targets.mk /.venv/ /.vscode/ /lib @@ -18,7 +19,6 @@ Gemfile.lock archive.json draft-dekater-scion-dataplane.xml -.DS_Store package-lock.json report.xml !requirements.txt diff --git a/Makefile b/Makefile index de46d56..9a5d15b 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,12 @@ include $(LIBDIR)/main.mk $(LIBDIR)/main.mk: ifneq (,$(shell grep "path *= *$(LIBDIR)" .gitmodules 2>/dev/null)) git submodule sync - git submodule update $(CLONE_ARGS) --init + git submodule update --init else - git clone -q --depth 10 $(CLONE_ARGS) \ - -b main https://github.com/martinthomson/i-d-template $(LIBDIR) +ifneq (,$(wildcard $(ID_TEMPLATE_HOME))) + ln -s "$(ID_TEMPLATE_HOME)" $(LIBDIR) +else + git clone -q --depth 10 -b main \ + https://github.com/martinthomson/i-d-template $(LIBDIR) +endif endif