Restructure files.

STFC-ICD-Research-and-Design · Oct 12, 2023 · 20df275 · 20df275
1 parent f640b0e
commit 20df275
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 43 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,18 +48,18 @@ jobs:
       - uses: cachix/install-nix-action@v20
 
       - name: Build
-        run: nix build -L .#${{ matrix.package }}.package
+        run: nix build -L .#${{ matrix.package }}
 
-      # - name: Build and push container image
-      #   if: ${{ github.ref_name == 'main' || github.ref_type == 'tag' }}
-      #   run: |
-      #     set -x
-      #
-      #     local_cr="docker-archive://$(nix build .#${{ matrix.package }}.container-image --no-link --print-out-paths)"
-      #     remote_cr="docker://ghcr.io/STFC-ICD-Research-and-Design/${{ matrix.package }}"
-      #
-      #     skopeo copy --dest-creds="dannixon:${{ github.token }}" "$local_cr" "$remote_cr:${{ github.ref_name }}"
-      #     skopeo copy --dest-creds="dannixon:${{ github.token }}" "$local_cr" "$remote_cr:${{ github.sha }}"
-      #     if [[ "${{ github.ref_type }}" == 'tag' ]]; then
-      #       skopeo copy --dest-creds="dannixon:${{ github.token }}" "$local_cr" "$remote_cr:latest"
-      #     fi
+      - name: Build and push container image
+        if: ${{ github.ref_name == 'main' || github.ref_type == 'tag' }}
+        run: |
+          set -x
+
+          local_cr="docker-archive://$(nix build .#${{ matrix.package }}-container-image --no-link --print-out-paths)"
+          remote_cr="docker://ghcr.io/STFC-ICD-Research-and-Design/${{ matrix.package }}"
+
+          skopeo copy --dest-creds="dannixon:${{ github.token }}" "$local_cr" "$remote_cr:${{ github.ref_name }}"
+          skopeo copy --dest-creds="dannixon:${{ github.token }}" "$local_cr" "$remote_cr:${{ github.sha }}"
+          if [[ "${{ github.ref_type }}" == 'tag' ]]; then
+            skopeo copy --dest-creds="dannixon:${{ github.token }}" "$local_cr" "$remote_cr:latest"
+          fi
diff --git a/events-to-histogram/default.nix b/events-to-histogram/default.nix
@@ -6,7 +6,7 @@
   nativeBuildInputs,
   buildInputs,
 } : {
-  package = naersk'.buildPackage {
+  events-to-histogram = naersk'.buildPackage {
     name = "events-to-histogram";
     version = version;
 
@@ -21,8 +21,7 @@
     };
   };
 
-  /*
-  container-image = pkgs.dockerTools.buildImage {
+  events-to-histogram-container-image = pkgs.dockerTools.buildImage {
     name = "events-to-histogram";
     tag = "latest";
     created = "now";
@@ -43,5 +42,4 @@
       ];
     };
   };
-  */
 }
diff --git a/flake.nix b/flake.nix
@@ -48,12 +48,6 @@
         };
 
         packages = {
-          events-to-histogram = import ./events-to-histogram { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; };
-          kafka-daq-report = import ./kafka-daq-report { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; };
-          simulator = import ./simulator { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; };
-          stream-to-file = import ./stream-to-file { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs hdf5-joined; };
-          trace-archiver = import ./trace-archiver { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs hdf5-joined; };
-          trace-to-events = import ./trace-to-events { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; };
 
           fmt = naersk'.buildPackage {
             src = ./.;
@@ -74,7 +68,13 @@
             # Ensure detailed test output appears in nix build log
             cargoTestOptions = x: x ++ ["1>&2"];
           };
-        };
+        } //
+        import ./events-to-histogram { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; } //
+        import ./kafka-daq-report { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; } //
+        import ./simulator { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; } //
+        import ./stream-to-file { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs hdf5-joined; } //
+        import ./trace-archiver { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs hdf5-joined; } //
+        import ./trace-to-events { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; };
       }
     );
 }
diff --git a/kafka-daq-report/default.nix b/kafka-daq-report/default.nix
@@ -6,7 +6,7 @@
   nativeBuildInputs,
   buildInputs,
 } : {
-  package = naersk'.buildPackage {
+  kafka-daq-report = naersk'.buildPackage {
     name = "kafka-daq-report";
     version = version;
 
@@ -21,8 +21,7 @@
     };
   };
 
-  /*
-  container-image = pkgs.dockerTools.buildImage {
+  kafka-daq-report-container-image = pkgs.dockerTools.buildImage {
     name = "kafka-daq-report";
     tag = "latest";
     created = "now";
@@ -43,5 +42,4 @@
       ];
     };
   };
-  */
 }
diff --git a/simulator/default.nix b/simulator/default.nix
@@ -6,7 +6,7 @@
   nativeBuildInputs,
   buildInputs,
 } : {
-  package = naersk'.buildPackage {
+  simulator = naersk'.buildPackage {
     name = "simulator";
     version = version;
 
@@ -21,8 +21,7 @@
     };
   };
 
-  /*
-  container-image = pkgs.dockerTools.buildImage {
+  simulator-container-image = pkgs.dockerTools.buildImage {
     name = "simulator";
     tag = "latest";
     created = "now";
@@ -43,5 +42,4 @@
       ];
     };
   };
-  */
 }
diff --git a/stream-to-file/default.nix b/stream-to-file/default.nix
@@ -7,7 +7,7 @@
   buildInputs,
   hdf5-joined,
 } : {
-  package = naersk'.buildPackage {
+  stream-to-file = naersk'.buildPackage {
     name = "stream-to-file";
     version = version;
 
@@ -24,8 +24,7 @@
     HDF5_DIR = "${hdf5-joined}";
   };
 
-  /*
-  container-image = pkgs.dockerTools.buildImage {
+  stream-to-file-container-image = pkgs.dockerTools.buildImage {
     name = "stream-to-file";
     tag = "latest";
     created = "now";
@@ -46,5 +45,4 @@
       ];
     };
   };
-  */
 }
diff --git a/trace-archiver/default.nix b/trace-archiver/default.nix
@@ -7,7 +7,7 @@
   buildInputs,
   hdf5-joined,
 } : {
-  package = naersk'.buildPackage {
+  trace-archiver = naersk'.buildPackage {
     name = "trace-archiver";
     version = version;
 
@@ -24,7 +24,7 @@
     HDF5_DIR = "${hdf5-joined}";
   };
 
-  /* container-image = pkgs.dockerTools.buildImage {
+  trace-archiver-container-image = pkgs.dockerTools.buildImage {
     name = "trace-archiver";
     tag = "latest";
     created = "now";

diff --git a/trace-to-events/default.nix b/trace-to-events/default.nix
@@ -6,7 +6,7 @@
   nativeBuildInputs,
   buildInputs,
 } : {
-  package = naersk'.buildPackage {
+  trace-to-events = naersk'.buildPackage {
     name = "trace-to-events";
     version = version;
 
@@ -21,8 +21,7 @@
     };
   };
 
-  /*
-  container-image = pkgs.dockerTools.buildImage {
+  trace-to-events-container-image = pkgs.dockerTools.buildImage {
     name = "trace-to-events";
     tag = "latest";
     created = "now";
@@ -43,5 +42,4 @@
       ];
     };
   };
-  */
 }