Skip to content

Commit 6d5cc2f

Browse files
Commenting out prover application
Revised paths Fixed reference format Try fixing env var injection Injecting GitHub secret into container Added visual help Injecting workspace path Fixed path to workspace Tried fixing permission issue Added continuous integration status badge Run tests continuously Run as root user Downgrading [checkout](actions/checkout#956) Trying 1001 instead of root first Upgraded checkout action Added job names Fixed test target Removed user option
1 parent 40e2316 commit 6d5cc2f

File tree

7 files changed

+40
-20
lines changed

7 files changed

+40
-20
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "ghcr.io/thierrymarianne/automated-theorem-proving-for-prolog-verification:latest",
2+
"image": "ghcr.io/atp-lptp/automated-theorem-proving-for-prolog-verification:latest",
33
"features": {
44
}
55
}

.github/workflows/continuous-integration.yaml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Apply ATP prover on FOF files
33
on:
44
push:
55
tags:
6-
- atp-lptp-v*.*.*
6+
- v*.*.*
77
pull_request:
88
branches:
99
- '*'
@@ -12,6 +12,8 @@ jobs:
1212
release:
1313
runs-on: ubuntu-latest
1414

15+
name: Create release
16+
1517
steps:
1618
- name: Set env
1719
run: |
@@ -76,6 +78,8 @@ jobs:
7678
build-fof_apply-provers:
7779
needs: push_to_registry
7880

81+
name: Build FOF files, apply provers, parse results
82+
7983
runs-on: ubuntu-latest
8084
defaults:
8185
run:
@@ -86,20 +90,32 @@ jobs:
8690
credentials:
8791
username: ${{ github.actor }}
8892
password: ${{ secrets.github_token }}
93+
volumes:
94+
- ${{ github.workspace }}:/workspace
8995
options: --cpus 2
9096
env:
9197
RELEASE_NAME: ${{ needs.push_to_registry.outputs.release_name }}
98+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9299

93100
steps:
101+
- name: Check out the repo
102+
uses: actions/checkout@v4.1.1
103+
with:
104+
ref: ${{ github.event.pull_request.head.sha }}
105+
106+
- name: Run tests
107+
working-directory: /usr/local/atp-prolog-verification
108+
run: make test
109+
94110
- name: Make FOF files
95111
working-directory: /usr/local/atp-prolog-verification
96112
run: |
97113
echo 'release '$RELEASE_NAME
98114
make build-fof-for-each-program
99115
100-
#- name: Applying provers on FOF files for all programs available in ./src
101-
# working-directory: /usr/local/atp-prolog-verification
102-
# run: make apply-provers-for-each-program
116+
## - name: Applying provers on FOF files for all programs available in ./src
117+
## working-directory: /usr/local/atp-prolog-verification
118+
## run: make apply-provers-for-each-program
103119

104120
- name: Parse results
105121
working-directory: /usr/local/atp-prolog-verification
@@ -111,18 +127,20 @@ jobs:
111127

112128
- name: Archive FOF files, results
113129
working-directory: /usr/local/atp-prolog-verification
114-
env:
115-
RELEASE_NAME: ${{ env.RELEASE_NAME }}
116-
run: /bin/bash -c '. .github/workflows/release/build-archive.sh'
130+
run: |
131+
echo 'release '$RELEASE_NAME
132+
RELEASE_NAME=$RELEASE_NAME /bin/bash -c '. .github/workflows/release/build-archive.sh'
133+
cp /usr/local/atp-prolog-verification/$RELEASE_NAME /workspace/$RELEASE_NAME
117134
118135
- uses: actions/upload-artifact@main
119136
with:
120137
path: |
121-
/usr/local/atp-prolog-verification/$RELEASE_NAME
138+
${{ github.workspace }}/$RELEASE_NAME
122139
123140
- name: Publish release
124141
working-directory: /usr/local/atp-prolog-verification
125-
run: /bin/bash -c '. ./.github/workflows/release/publish-archive.sh'
126-
env:
127-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
128-
RELEASE_NAME: $RELEASE_NAME
142+
run: |
143+
echo 'release '$RELEASE_NAME
144+
GITHUB_TOKEN=$GITHUB_TOKEN \
145+
RELEASE_NAME=$RELEASE_NAME \
146+
/bin/bash -c '. ./.github/workflows/release/publish-archive.sh'

.github/workflows/release/build-archive.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
function build() {
44
tar cvzf \
5-
'/usr/local/atp-prolog-verification/'$RELEASE_NAME'.tar.gz' \
5+
'/usr/local/atp-prolog-verification/'$RELEASE_NAME \
66
'./out/'*.out \
77
'./out/'results.* \
88
'./src/'*/*.fof \

.github/workflows/release/publish-archive.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function publish() {
4040

4141
curl \
4242
-X POST \
43-
--data-binary @"${result}" \
43+
--data-binary @"${results}" \
4444
-H 'Content-Type: application/octet-stream' \
4545
-H "Authorization: Bearer ${GITHUB_TOKEN}" \
4646
"${upload_url}?name=${archive_name}"
@@ -53,4 +53,4 @@ function publish() {
5353
"${upload_url}?name=${archive_name}.sha256sum"
5454
}
5555

56-
publish './'"${RELEASE_NAME}"
56+
publish '/usr/local/atp-prolog-verification/'"${RELEASE_NAME}"

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM ghcr.io/thierrymarianne/automated-theorem-proving-for-prolog-verification:base
1+
FROM ghcr.io/atp-lptp/automated-theorem-proving-for-prolog-verification:base
22

33
LABEL maintainer="Thierry Marianne <thierry.marianne@univ-reunion.fr>"
44

5-
LABEL org.opencontainers.image.source="https://github.com/thierrymarianne/automated-theorem-proving-for-prolog-verification"
5+
LABEL org.opencontainers.image.source="https://github.com/atp-lptp/automated-theorem-proving-for-prolog-verification"
66

77
COPY --chown=1000:1000 \
88
./ \

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Automated Theorem Proving for Prolog Verification
22

3+
[![Apply ATP prover on FOF files](https://github.com/atp-lptp/automated-theorem-proving-for-prolog-verification/actions/workflows/continuous-integration.yaml/badge.svg)](https://github.com/atp-lptp/automated-theorem-proving-for-prolog-verification/actions/workflows/continuous-integration.yaml)
4+
35
[Automated Theorem Proving for Prolog Verification [PDF]](ATP-for-LP-Verif.pdf)
46

57
## Build FOF files

etc/docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ services:
1010
- OWNER_UID=${PROGRAM_OWNER_UID:-1000}
1111
- OWNER_GID=${PROGRAM_OWNER_GID:-1000}
1212
tags:
13-
- "ghcr.io/thierrymarianne/automated-theorem-proving-for-prolog-verification:base"
13+
- "ghcr.io/atp-lptp/automated-theorem-proving-for-prolog-verification:base"
1414
healthcheck:
1515
interval: 30s
1616
timeout: 10s
1717
retries: 3
1818
start_period: 1m
1919
test: ["CMD", "/bin/bash", "-c", "( test $(ps ax | grep -E 'tini' -c) -gt 0 )"]
2020
labels:
21-
org.opencontainers.image.source: 'https://github.com/thierrymarianne/automated-theorem-proving-for-prolog-verification'
21+
org.opencontainers.image.source: 'https://github.com/atp-lptp/automated-theorem-proving-for-prolog-verification'
2222
restart: 'always'
2323
platform: 'linux/amd64'

0 commit comments

Comments
 (0)