From a7a360c6dc42ece2d097448f9bfad9d25d24a192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Sun, 29 May 2022 20:09:51 +0100 Subject: [PATCH 1/3] test_dep_update: exit gracefully if no pending PRs --- .github/workflows/test_dep_update.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test_dep_update.sh b/.github/workflows/test_dep_update.sh index 2355f8e..0b1b110 100755 --- a/.github/workflows/test_dep_update.sh +++ b/.github/workflows/test_dep_update.sh @@ -7,6 +7,12 @@ git branch depupdate git checkout depupdate git reset --hard origin/master json="$(gh pr list --search "author:app/github-actions" --json headRefName,number)" +# If there's no updates then the CI action will fail without this, which is more common if we reduce the schedule from 24 hours. +if [[ $json == "[]" ]]; then + echo "No Dependency update PRs to merge" + exit +fi + echo "$json" | jq '.[] | .headRefName | @text' | xargs -L1 -- git pull origin if nix build .#checks.x86_64-linux.init-example-el; then echo "$json" | jq ".[] | .number | @text" | xargs -L1 -- gh pr merge --squash --delete-branch From 7f9cfd6640dd38e4732fa47b4d670902f01a39ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Tue, 31 May 2022 10:34:31 +0100 Subject: [PATCH 2/3] test_dep_update: sleep some seconds before merging PR --- .github/workflows/test_dep_update.sh | 10 +++++++++- dbgmd-00001.sign | 0 result | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 dbgmd-00001.sign create mode 120000 result diff --git a/.github/workflows/test_dep_update.sh b/.github/workflows/test_dep_update.sh index 0b1b110..2fc3763 100755 --- a/.github/workflows/test_dep_update.sh +++ b/.github/workflows/test_dep_update.sh @@ -15,7 +15,15 @@ fi echo "$json" | jq '.[] | .headRefName | @text' | xargs -L1 -- git pull origin if nix build .#checks.x86_64-linux.init-example-el; then - echo "$json" | jq ".[] | .number | @text" | xargs -L1 -- gh pr merge --squash --delete-branch + prs=$(echo "$json" | jq ".[] | .number") + for pr in $prs; do + # Whenever there's a bunch of PRs to merge at the same time + # the GitHub API needs some time to update its internal + # state before allowing another PR to be merged. + sleep 5 + + gh pr merge --squash --delete-branch "$pr" + done else gh issue create \ --title "Recent Dependency update PRs failing tests" \ diff --git a/dbgmd-00001.sign b/dbgmd-00001.sign new file mode 100644 index 0000000..e69de29 diff --git a/result b/result new file mode 120000 index 0000000..8fa7b55 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/46rxb7v3yqisakm0sd0a7w28gxwnfs5g-emacs-with-packages-28.1 \ No newline at end of file From 96209801150e898e080d75e571403a48cad05b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 30 May 2022 18:44:52 +0100 Subject: [PATCH 3/3] update git references from hlissner repos to doomemacs org --- .github/workflows/update_init_el.py | 2 +- README.md | 2 +- flake.lock | 68 ++++++++++++++--------------- flake.nix | 4 +- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/update_init_el.py b/.github/workflows/update_init_el.py index 6f6210e..0f5773f 100755 --- a/.github/workflows/update_init_el.py +++ b/.github/workflows/update_init_el.py @@ -16,7 +16,7 @@ DRY_RUN = bool(env.get("GITHUB_DRY_RUN", False)) INIT_EL = "test/doom.d/init.el" UPSTREAM_INIT_EL = "init.example.el" -DOOM_UPSTREAM = "hlissner/doom-emacs" +DOOM_UPSTREAM = "doomemacs/doomemacs" UPSTREAM_BRANCH = "develop" diff --git a/README.md b/README.md index cd0e55d..7e38c40 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ | Dependency updater | [![Dependency Updater Status](https://github.com/nix-community/nix-doom-emacs/workflows/Update%20Dependencies/badge.svg?branch=master)](https://github.com/nix-community/nix-doom-emacs/actions/workflows/update-dependencies.yml?query=branch%3Amaster) | Nix expression to install and configure -[doom-emacs](https://github.com/hlissner/doom-emacs). +[doom-emacs](https://github.com/doomemacs/doomemacs). The expression builds a `doom-emacs` distribution with dependencies pre-installed based on an existing `~/.doom.d` directory. diff --git a/flake.lock b/flake.lock index 89cd418..0687b22 100644 --- a/flake.lock +++ b/flake.lock @@ -3,44 +3,44 @@ "doom-emacs": { "flake": false, "locked": { - "lastModified": 1651775574, - "narHash": "sha256-ux4bzsQJmSxscLrtLR5h2SbXGlt4mKS0B1ffzvO35Ng=", - "owner": "hlissner", - "repo": "doom-emacs", - "rev": "80cd7557e147ccd0abef05ff4eafb93fe9545ad4", + "lastModified": 1654347726, + "narHash": "sha256-B4N+UQ0SvnCH0Hqc62Wl1KS6WcTBGLag0BoH3UZGbgo=", + "owner": "doomemacs", + "repo": "doomemacs", + "rev": "bea3cc161c0a803dcf574f32ee555dccf565a5ce", "type": "github" }, "original": { - "owner": "hlissner", + "owner": "doomemacs", "ref": "master", - "repo": "doom-emacs", + "repo": "doomemacs", "type": "github" } }, "doom-snippets": { "flake": false, "locked": { - "lastModified": 1651709822, - "narHash": "sha256-/PJwt5EuTuUwTD8fmt9vYye3PyPVF0Mrco+Ext0KEJ4=", - "owner": "hlissner", - "repo": "doom-snippets", - "rev": "2596cead5e03896996b7268d057c1d734180547f", + "lastModified": 1651768501, + "narHash": "sha256-55mHNFfn3N8k4aWgswX9buATsOhQTJ0L05UaUNNMgDg=", + "owner": "doomemacs", + "repo": "snippets", + "rev": "f74b11b1e0fe8481e20f3065e355efe627e635de", "type": "github" }, "original": { - "owner": "hlissner", - "repo": "doom-snippets", + "owner": "doomemacs", + "repo": "snippets", "type": "github" } }, "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1651724664, - "narHash": "sha256-/Z0AkB2DAxMdOaFYBSkTPjHrMH2e3kReuLEtpLQZfk4=", + "lastModified": 1655032304, + "narHash": "sha256-t0E7c7V+hk6ILXl4+TBLqQfqq8/4IKyb/cFg0a8mqI8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1deb4d66be3117dd0d9dbf31fd458035e0f3c4de", + "rev": "a73897fc387a83c8dd2142ed597041113954ec23", "type": "github" }, "original": { @@ -131,11 +131,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1651779476, - "narHash": "sha256-wPXzrSdad3qocoz2t375Gtm/2sh2+e2A/Iqsc9+oiF4=", + "lastModified": 1654964420, + "narHash": "sha256-Pu9TvVyWMLH362RGBYKMgX2ILSxRPtWovBmBC2s6Zjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "020b061a1aef9e678770295f86b1f58007e284eb", + "rev": "419e07c3823fff0bbe24b2759a2d73a01ecd3c69", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1651675049, - "narHash": "sha256-lReN2q3o6CUDT8dDsj+LZ4ptzG9E2PwNv5JWWb5D5B4=", + "lastModified": 1654949849, + "narHash": "sha256-1xGPQv2rFF4KglqwjKz+1uzB81nqa+6lgXPpnU3mduE=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "d2a459d2596a0cfb1389207b117533389fa59e0f", + "rev": "ed6f8dc67f5f1abf6b20929bdb571def2c191006", "type": "github" }, "original": { @@ -243,11 +243,11 @@ "org-contrib": { "flake": false, "locked": { - "lastModified": 1639727892, - "narHash": "sha256-+T6Y87aSAx7kMpigm8d1ODDQIyPBM6a+4qGolXjCEXs=", - "ref": "master", - "rev": "5766ff1088191e4df5fecd55007ba4271e609bcc", - "revCount": 2611, + "lastModified": 1654411077, + "narHash": "sha256-ywXAI+s+D701PvuDEQljDmFWrTPymqustSYVyf3NYRk=", + "ref": "refs/heads/master", + "rev": "c6aef31ccfc7c4418c3b51e98f7c3bd8e255f5e6", + "revCount": 2622, "type": "git", "url": "https://git.sr.ht/~bzg/org-contrib" }, @@ -291,11 +291,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1651495761, - "narHash": "sha256-B3L8h0CyYgZCen8aWyLiDXHZMugXAzFToLJNg8f2PWU=", + "lastModified": 1653993278, + "narHash": "sha256-X43lsjoLBWmttIKj9Jzut0UP0dZlsue3fYbJ3++ojbU=", "owner": "hakimel", "repo": "reveal.js", - "rev": "0ca389721c5c7eff5db6f67159cbb1cdd51a3d7f", + "rev": "039972c730690af7a83a5cb832056a7cc8b565d7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a07fbd7..d4c5a66 100644 --- a/flake.nix +++ b/flake.nix @@ -36,9 +36,9 @@ description = "nix-doom-emacs home-manager module"; inputs = { - doom-emacs.url = "github:hlissner/doom-emacs/master"; + doom-emacs.url = "github:doomemacs/doomemacs/master"; doom-emacs.flake = false; - doom-snippets.url = "github:hlissner/doom-snippets"; + doom-snippets.url = "github:doomemacs/snippets"; doom-snippets.flake = false; emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.flake = false;