Skip to content

Commit

Permalink
Update repo build tooling and CI pipelines
Browse files Browse the repository at this point in the history
Turn off publish pipeline until keys are setup
  • Loading branch information
ikaneshiro committed Dec 23, 2021
1 parent 20af01f commit b13df61
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: publish

on:
push:
# on:
# push:

jobs:
publish:
Expand All @@ -17,7 +17,7 @@ jobs:
with:
go-version: 1.17.3

- name: Install Singularity dependencies
- name: Install Apptainer dependencies
run: |
sudo apt-get install -f -y build-essential libssl-dev uuid-dev squashfs-tools libseccomp-dev cryptsetup-bin libgpgme-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
go-version: 1.17.3

- name: Install Singularity dependencies
- name: Install Apptainer dependencies
run: |
sudo apt-get install -f -y build-essential libssl-dev uuid-dev squashfs-tools libseccomp-dev cryptsetup-bin libgpgme-dev
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "apptainer_source"]
path = apptainer_source
url = https://github.com/apptainer/apptainer.git
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ help:

ifndef SKIPCLI

clidocs: cli/singularity.rst
clidocs: cli/apptainer.rst

singularity_source/builddir/singularity:
cd singularity_source &&\
apptainer_source/builddir/apptainer:
cd apptainer_source &&\
./mconfig &&\
cd builddir &&\
make

cli/singularity.rst: singularity_source/builddir/singularity
cd singularity_source &&\
cli/apptainer.rst: apptainer_source/builddir/apptainer
cd apptainer_source &&\
go run ./cmd/docs rst --dir ../cli

endif
Expand Down
1 change: 1 addition & 0 deletions apptainer_source
Submodule apptainer_source added at e4b2ff

0 comments on commit b13df61

Please sign in to comment.