diff --git a/.github/workflows/package-pr.yaml b/.github/workflows/package-pr.yaml
index de2f025..245e81a 100644
--- a/.github/workflows/package-pr.yaml
+++ b/.github/workflows/package-pr.yaml
@@ -11,8 +11,8 @@ on:
- 'packages/**'
jobs:
- packages-affected:
- name: List affected packages
+ check-build:
+ name: Check that package builds
runs-on: ubuntu-latest
steps:
- name: Get PR Commits
@@ -21,7 +21,6 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Check subsystem
- if: ${{ success() || failure() }}
uses: tim-actions/commit-message-checker-with-regex@v0.3.1
with:
commits: ${{ steps.get-pr-commits.outputs.commits }}
@@ -33,17 +32,45 @@ jobs:
shell: bash
run: |
COMMITS='${{ steps.get-pr-commits.outputs.commits }}'
- PACKAGES=$(echo $COMMITS | jq .[].commit.message -r | grep -oP '^pkg\(\K[^:\h\n]+(?=\))' | sort -u | sed 's/^/* /')
- PACKAGES=${PACKAGES//$'%'/'%25'}
- PACKAGES=${PACKAGES//$'\n'/'%0A'}
- PACKAGES=${PACKAGES//$'\r'/'%0D'}
+ PACKAGES=$(echo $COMMITS | jq .[].commit.message -r | grep -oP '^pkg\(\K[^:\h\n]+(?=\))' | sort -u)
echo "::set-output name=packages::$PACKAGES"
- - name: 'Comment PR'
- uses: actions/github-script@0.3.0
- if: github.event_name == 'pull_request'
- with:
- github-token: ${{ secrets.GITHUB_TOKEN }}
- script: |
- const { issue: { number: issue_number }, repo: { owner, repo } } = context;
- github.issues.createComment({ issue_number, owner, repo, body: "Affected packages:\n${{ steps.get-packages.outputs.packages }}" });
\ No newline at end of file
+ - name: Checkout
+ uses: actions/checkout@v2
+
+ - name: Build docker containers
+ run: |
+ docker build -t piston_fs_repo repo
+ docker build -t piston_api api
+
+ - name: Build Packages
+ run: |
+ docker run -v $(pwd)'/repo:/repo' -v $(pwd)'/packages:/packages' piston_fs_repo ${{ steps.get-packages.outputs.packages }}
+
+ - name: Run tests
+ run: |
+ docker run -p 6969:6969 -v $(pwd)'/data:/piston' -v $(pwd)'/repo:/repo' --privileged --name api piston_api &
+ echo Waiting for API to start..
+ while [[ "$(curl -s -w '%{http_code}' http://127.0.0.1:6969/runtimes)" != "200" ]]; do sleep 5; done
+ echo Adding local repo
+ curl -s http://127.0.0.1:6969/repos -XPOST -d "slug=local&url=file:///repo/index.yaml"
+ echo Testing packages
+ for pkg in "$(curl -s http://127.0.0.1:6969/repos/local/packages/ | jq '.data.packages[] | "\(.language)/\(.language_version)"' -r)"
+ do
+ PKG_SLUG=${pkg/\//-}
+ PKG_NAME=$(echo $pkg | cut -d'/' -f 1)
+ PKG_VERSION=$(echo $pkg | cut -d'/' -f 2)
+ echo Installing ${PKG_SLUG}
+ curl -sXPOST http://127.0.0.1:6969/repos/local/packages/${pkg} | jq '.language' -r || exit 1
+ echo Testing ${PKG_SLUG} (using ${PKG_SLUG}.tf)
+ TEST_FILE=$(cat ${PKG_SLUG}.tf)
+ TEST_JSON=`jq -C '.language = "${PKG_NAME}" | .version = "${PKG_VERSION}" | .files=[] | .files[0]={} | .files[0].name="test" | .files[0].name.content="${TEST_FILE}" | .main = "test" | .args = [] | .stdin = "" | .compile_timeout = 10000 | .run_timeout = 3000' <<< '{}'`
+ curl -sXPOST http://127.0.0.1:6969/jobs -H 'Content-Type: application/json' -d "$TEST_JSON" > ${PKG_SLUG}.tr
+ jq '.run.stdout' ${PKG_SLUG}.tr | grep "OK" || exit 1
+ done
+
+
+
+
+
+
diff --git a/README.MD b/README.MD
index aaec498..bc40f1c 100644
--- a/README.MD
+++ b/README.MD
@@ -204,7 +204,7 @@ Content-Type: application/json
# Supported Languages
-`python`,`node`
+`python`,`php`,`node`
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 509e677..c74a814 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -16,11 +16,7 @@ services:
piston_fs_repo: #Temporary solution until CI works
build: repo
- command: >
- bash -c '/repo/make.sh &&
- curl http://piston_api:6969/repos -XPOST -d "slug=local&url=file:///repo/index.yaml";
- echo -e "\nAn error here is fine, it just means its already added it. Perhaps you restarted this container"
- '
+ command: ['python'] # Only build python
volumes:
- ./repo:/repo
- ./packages:/packages
\ No newline at end of file
diff --git a/packages/.gitignore b/packages/.gitignore
index 2e367bf..5c3f8df 100644
--- a/packages/.gitignore
+++ b/packages/.gitignore
@@ -1,2 +1,3 @@
build/
-*.pkg.tar.gz
\ No newline at end of file
+*.pkg.tar.gz
+*.tf
\ No newline at end of file
diff --git a/packages/Makefile b/packages/Makefile
index 91124e2..44fe47c 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -5,6 +5,8 @@ PKG_FILES=$(filter-out common.mk,$(wildcard *.mk))
PKG_SLUGS=$(foreach pkg, ${PKG_FILES}, $(addprefix $(shell make -f ${pkg} name VERSION=UNKNOWN)-, $(shell make -f ${pkg} versions VERSION=UNKNOWN)))
# Functions
+CALL_MAKE=$(shell make -f $1 $2 VERSION=UNKNOWN)
+
define pkg_info
$(eval PKG_SLUG=$(patsubst $1-%,%,$2))
$(eval PKG_VERSION=$(lastword $(subst -, ,${PKG_SLUG})))
@@ -12,18 +14,27 @@ define pkg_info
$(eval PKG_FILE=$(shell grep '^VERSIONS\s*=.*${PKG_VERSION}' $(shell grep "NAME\s*=\s*${PKG_NAME}" ${PKG_FILES} -l) -l))
endef
+define per-lang
+build-$(call CALL_MAKE, $1, name):: $$(addprefix build-$(call CALL_MAKE, $1, name)-, $$(call CALL_MAKE, $1, versions))
+clean-$(call CALL_MAKE, $1, name):: $$(addprefix clean-$(call CALL_MAKE, $1, name)-, $$(call CALL_MAKE, $1, versions))
+endef
+
+
# Targets
-build: $(foreach pkg, ${PKG_FILES}, $(addprefix build-$(shell make -f ${pkg} name VERSION=UNKNOWN)-, $(lastword $(shell make -f ${pkg} versions VERSION=UNKNOWN))))
+$(foreach e,${PKG_FILES}, $(eval $(call per-lang,${e})))
+
+build build-all: $(foreach pkg, ${PKG_FILES}, build-$(call CALL_MAKE, ${pkg}, name))
$(addprefix build-, ${PKG_SLUGS}):
$(call pkg_info,build,$@)
$(MAKE) -f ${PKG_FILE} VERSION=${PKG_VERSION} build
-
-
-clean: $(foreach pkg, ${PKG_FILES}, $(addprefix clean-$(shell make -f ${pkg} name VERSION=UNKNOWN)-, $(shell make -f ${pkg} versions VERSION=UNKNOWN)))
+clean clean-all: $(foreach pkg, ${PKG_FILES}, clean-$(call CALL_MAKE, ${pkg}, name))
rm -rf build/
+
$(addprefix clean-, ${PKG_SLUGS}):
$(call pkg_info,clean,$@)
$(MAKE) -f ${PKG_FILE} VERSION=${PKG_VERSION} clean
+
+
diff --git a/packages/common.mk b/packages/common.mk
index ec069b0..d71d584 100644
--- a/packages/common.mk
+++ b/packages/common.mk
@@ -34,11 +34,12 @@ name:
.NOTPARALLEL: build
-build: ${BUILD_DIR} ${PKG_FILE}
+build: ${BUILD_DIR} ${PKG_FILE} ${PKG_SLUG}.tf
clean:
rm -rf ${BUILD_DIR}
rm -f ${PKG_FILE}
+ rm -f ${PKG_SLUG}.tf
# mkdir
${BUILD_DIR}:
@@ -61,7 +62,8 @@ $(patsubst %.json,%.jq,${INFO_FILE}):
echo '.build_platform="$(or ${PLATFORM}, baremetal-$(shell grep -oP "^ID=\K\w+" /etc/os-release ))"' >> $@
$(foreach dep, ${DEPENDENCIES}, echo '.dependencies.$(word 1,$(subst =, ,${dep}))="$(word 2,$(subst =, ,${dep}))"' >> $@)
-
+${PKG_SLUG}.tf:
+ cp ${NAME}.test $@
# Helpers
%/: %.tar.gz
diff --git a/packages/php.mk b/packages/php.mk
new file mode 100644
index 0000000..65dbc37
--- /dev/null
+++ b/packages/php.mk
@@ -0,0 +1,24 @@
+NAME=php
+AUTHOR=Martin Kos
+DEPENDENCIES=
+COMPILED=false
+VERSIONS=7.4.15 8.0.2
+
+include common.mk
+
+
+${RUN_FILE}:
+ echo 'php $$*' > $@
+
+${ENV_FILE}:
+ echo 'export PATH=$$PWD/bin:$$PATH' > $@
+
+${BIN_DIR}: ${BUILD_DIR}php-${VERSION}-sources/
+ $(eval TMP_DIR=${PWD}/${BUILD_DIR}tmpout)
+ cd $< && ./configure --prefix ${PREFIX}
+ $(MAKE) -C $<
+ INSTALL_ROOT=${TMP_DIR}/ $(MAKE) -C $< install
+ mv ${TMP_DIR}${PREFIX} ${BIN_DIR} && rm -r ${TMP_DIR}
+
+${BUILD_DIR}php-${VERSION}-sources.tar.gz:
+ curl "https://www.php.net/distributions/php-${VERSION}.tar.gz" -o $@
diff --git a/packages/php.test b/packages/php.test
new file mode 100644
index 0000000..997ffba
--- /dev/null
+++ b/packages/php.test
@@ -0,0 +1,3 @@
+
diff --git a/packages/python.mk b/packages/python.mk
index 02fe442..d0aa0ab 100644
--- a/packages/python.mk
+++ b/packages/python.mk
@@ -2,7 +2,7 @@ NAME=python
AUTHOR=Thomas Hobson
DEPENDENCIES=
COMPILED=false
-VERSIONS=2.7.1 3.5.1 3.9.1
+VERSIONS=3.5.1 3.9.1
include common.mk
@@ -15,6 +15,7 @@ ${ENV_FILE}:
${BIN_DIR}: ${BUILD_DIR}Python-${VERSION}/
$(eval TMP_DIR=${PWD}/${BUILD_DIR}tmpout/)
+
cd $< && ./configure --prefix ${PREFIX}
$(MAKE) -C $<
DESTDIR=${TMP_DIR} $(MAKE) -C $< altinstall
diff --git a/repo/Dockerfile b/repo/Dockerfile
index 8980d53..35201e0 100644
--- a/repo/Dockerfile
+++ b/repo/Dockerfile
@@ -5,4 +5,7 @@ RUN apt-get update && apt-get install -y autoconf build-essential libssl-dev pkg
pip3 install 'yq==2.12.0' && \
rm -rf /var/lib/apt/lists/*
-CMD [ "bash", "/repo/make.sh" ]
\ No newline at end of file
+ADD *.sh /
+
+ENTRYPOINT ["bash","/entrypoint.sh"]
+CMD ["all"]
diff --git a/repo/entrypoint.sh b/repo/entrypoint.sh
new file mode 100755
index 0000000..6f917d7
--- /dev/null
+++ b/repo/entrypoint.sh
@@ -0,0 +1,10 @@
+cd /packages
+for pkg in "$*"
+do
+ make -j16 build-$pkg
+done
+
+cd /repo
+./mkindex.sh
+
+curl -s http://piston_api:6969/repos -XPOST -d "slug=local&url=file:///repo/index.yaml" || echo "WARNING: Could not add repository"
diff --git a/repo/make.sh b/repo/make.sh
deleted file mode 100755
index bad392e..0000000
--- a/repo/make.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash -e
-
-cd /repo
-
-# Make packages
-pushd ../packages/
-make -j16
-popd
-
-
-# Make repo index
-
-./mkindex.sh
\ No newline at end of file