Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.

Commit

Permalink
start of work to test automated builds with build cache
Browse files Browse the repository at this point in the history
I will likely update this PR many times until I can get it working.

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
  • Loading branch information
vsoch committed Aug 6, 2022
1 parent 6523120 commit 1591fdb
Show file tree
Hide file tree
Showing 12 changed files with 286 additions and 903 deletions.
62 changes: 0 additions & 62 deletions .github/workflows/build_tests_linux.yaml

This file was deleted.

45 changes: 45 additions & 0 deletions .github/workflows/test-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Test Build

on:
pull_request: []

jobs:
flux-core:
name: Test Build Action
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3

- name: Install Spack
run: |
git clone --depth 1 https://github.com/spack/spack /opt/spack
echo "/opt/spack/bin" >> $GITHUB_PATH
export PATH="/opt/spack/bin:$PATH"
spack external find
- name: Clingo Cache
uses: actions/cache@v3
with:
path: /opt/spack/opt/spack
key: ${{ runner.os }}-clingo

- name: Install Clingo
run: spack install clingo

- name: Install Pakages Builder
run: |
pip install clingo
git clone -b add/gh-actions-docs https://github.com/syspack/pakages
cd pakages
pip install .[all]
cd ../
rm -rf pakages
- name: Test Pakages Python Build
uses: syspack/pakages/action/build@add/gh-actions-docs
with:
user: ${{ github.actor }}
builder: spack
token: ${{ secrets.GITHUB_TOKEN }}
target: ghcr.io/flux-framework/flux-spack/flux-core:latest
165 changes: 0 additions & 165 deletions LICENSE

This file was deleted.

12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
# flux-spack
Staging repository for Flux's Spack package
# Flux Spack

This is a testing repository for ideas to:

1. Perform automated builds at some frequency to ensure flux packages build with spack
2. To keep a build cache that can make this more speedy.
3. To have a process for updating versions on new releases (via some other trigger)
4. To keep package recipes here, and automatically update upstream spack

**under development**
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
From bb0496137d5a15f67ccde15e4d1462d6abaee339 Mon Sep 17 00:00:00 2001
From: Jim Garlick <garlick.jim@gmail.com>
Date: Tue, 19 Oct 2021 14:27:47 -0700
Subject: [PATCH 1/1] build: fix build errors with side-installed 0MQ

Problem: when building against side-installed libzmq, libczmq,
compilation fails with a missing zframe_t definition.

If the side installed 0MQ packages were built with the "draft APIs"
enabled (the default), libczmqcontainers/zhashx.h and zlistx.h define
function prototypes using zframe_t. Extend CZMQ_BUILD_EXTRA to
include those prototypes so they are never defined in libczmqcontainers.
---
src/common/libczmqcontainers/zhashx.h | 2 +-
src/common/libczmqcontainers/zlistx.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/libczmqcontainers/zhashx.h b/src/common/libczmqcontainers/zhashx.h
index 01a69ae0a..d9cbe1712 100644
--- a/src/common/libczmqcontainers/zhashx.h
+++ b/src/common/libczmqcontainers/zhashx.h
@@ -267,7 +267,6 @@ CZMQ_EXPORT zhashx_t *
// Self test of this class.
CZMQ_EXPORT void
zhashx_test (bool verbose);
-#endif // CZMQ_BUILD_EXTRA

#ifdef CZMQ_BUILD_DRAFT_API
// *** Draft method, for development use, may change without warning ***
@@ -284,6 +283,7 @@ CZMQ_EXPORT zframe_t *
zhashx_pack_own (zhashx_t *self, zhashx_serializer_fn serializer);

#endif // CZMQ_BUILD_DRAFT_API
+#endif // CZMQ_BUILD_EXTRA
// @end

#ifdef __cplusplus
diff --git a/src/common/libczmqcontainers/zlistx.h b/src/common/libczmqcontainers/zlistx.h
index c2ccd9877..1bb55eb6c 100644
--- a/src/common/libczmqcontainers/zlistx.h
+++ b/src/common/libczmqcontainers/zlistx.h
@@ -197,7 +197,6 @@ CZMQ_EXPORT void
// Self test of this class.
CZMQ_EXPORT void
zlistx_test (bool verbose);
-#endif // CZMQ_BUILD_EXTRA

#ifdef CZMQ_BUILD_DRAFT_API
// *** Draft method, for development use, may change without warning ***
@@ -225,6 +224,7 @@ CZMQ_EXPORT zframe_t *
zlistx_pack (zlistx_t *self);

#endif // CZMQ_BUILD_DRAFT_API
+#endif // CZMQ_BUILD_EXTRA
// @end


--
2.27.0

0 comments on commit 1591fdb

Please sign in to comment.