From 09b725d3e5e7e2d3dc89a6d09473ad80268490e1 Mon Sep 17 00:00:00 2001 From: iamashwin99 Date: Sun, 17 Mar 2024 21:56:23 +0100 Subject: [PATCH 1/6] add a workflow for ci --- .github/workflows/diff-with-upstream.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/diff-with-upstream.yml diff --git a/.github/workflows/diff-with-upstream.yml b/.github/workflows/diff-with-upstream.yml new file mode 100644 index 0000000..4084bd7 --- /dev/null +++ b/.github/workflows/diff-with-upstream.yml @@ -0,0 +1,17 @@ +name: diff-with-upstream + +on: + schedule: + - cron: "0 0 * * 0" # Run once a week on Sunday at midnight + workflow_dispatch: + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Build the Docker image + run: make diff From 47881005357fdb70e4823d4f0a9ac63ee66cf7ad Mon Sep 17 00:00:00 2001 From: iamashwin99 Date: Sun, 17 Mar 2024 21:56:49 +0100 Subject: [PATCH 2/6] remove the true wrapper --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b296833..b5c1971 100644 --- a/Makefile +++ b/Makefile @@ -26,4 +26,4 @@ run-spack: diff: @echo "Compare (diff) spack/package.py with current package.py from spack develop" wget --output-document=spack/package-upstream.py https://raw.githubusercontent.com/spack/spack/develop/var/spack/repos/builtin/packages/octopus/package.py - diff spack/package-upstream.py spack/package.py || true + diff spack/package-upstream.py spack/package.py From f5acdefd3617e02de85e381641fdcf81cc7a5db6 Mon Sep 17 00:00:00 2001 From: iamashwin99 Date: Sun, 17 Mar 2024 21:56:56 +0100 Subject: [PATCH 3/6] add the badge to the readme --- README.rst | 6 +++++- spack/package.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index dd6cbbf..23e3372 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ Octopus in spack .. sectnum:: -.. contents:: +.. contents:: Octopus-in-spack ================ @@ -31,6 +31,8 @@ moment (if you follow `Compilation of Octopus using Spack`_): |spack-develop-octopus-develop| Spack develop version, develop version of Octopus +|diff-with-upstream| A check to see if this repository is in sync with the upstream spack repository. + Octopus and Spack - Quick start =============================== @@ -94,6 +96,8 @@ https://github.com/fangohr/octopus-in-docker .. |spack-develop-octopus-develop| image:: https://github.com/fangohr/octopus-in-spack/actions/workflows/spack-develop-octopus-develop.yml/badge.svg :target: https://github.com/fangohr/octopus-in-spack/actions/workflows/spack-develop-octopus-develop.yml +.. |diff-with-upstream| image:: https://github.com/fangohr/octopus-in-spack/actions/workflows/diff-with-upstream.yml/badge.svg + :target: https://github.com/fangohr/octopus-in-spack/actions/workflows/sdiff-with-upstream.yml .. comment: Outdated badges to follow diff --git a/spack/package.py b/spack/package.py index 3690feb..798301e 100644 --- a/spack/package.py +++ b/spack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +spack/package.py# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) From db028853f77cc1e87ccd53e6fc56f3fb5beed97f Mon Sep 17 00:00:00 2001 From: iamashwin99 Date: Sun, 17 Mar 2024 22:01:10 +0100 Subject: [PATCH 4/6] remove typo --- spack/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack/package.py b/spack/package.py index 798301e..3690feb 100644 --- a/spack/package.py +++ b/spack/package.py @@ -1,4 +1,4 @@ -spack/package.py# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) From ab15612f341d019b19bf5cf22286fe348b29fa7d Mon Sep 17 00:00:00 2001 From: Ashwin Kumar Karnad <46030335+iamashwin99@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:19:40 +0100 Subject: [PATCH 5/6] Update .github/workflows/diff-with-upstream.yml Co-authored-by: Hans Fangohr --- .github/workflows/diff-with-upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/diff-with-upstream.yml b/.github/workflows/diff-with-upstream.yml index 4084bd7..0e2d8cc 100644 --- a/.github/workflows/diff-with-upstream.yml +++ b/.github/workflows/diff-with-upstream.yml @@ -13,5 +13,5 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Build the Docker image + - name: Fetch and compare with upstream spack Octopus package file run: make diff From 1f8dd8e2685fdf36ae971f6f43ccc45e8ea0a99b Mon Sep 17 00:00:00 2001 From: Ashwin Kumar Karnad <46030335+iamashwin99@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:22:22 +0100 Subject: [PATCH 6/6] Update README.rst Co-authored-by: Hans Fangohr --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 23e3372..43e898a 100644 --- a/README.rst +++ b/README.rst @@ -31,7 +31,7 @@ moment (if you follow `Compilation of Octopus using Spack`_): |spack-develop-octopus-develop| Spack develop version, develop version of Octopus -|diff-with-upstream| A check to see if this repository is in sync with the upstream spack repository. +|diff-with-upstream| A check to see if our `octopus/package.py` file is in sync with the upstream [spack repository](https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/octopus/package.py). Octopus and Spack - Quick start