Skip to content

Commit

Permalink
chore: fix CI requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
M0Rf30 committed Jul 10, 2022
1 parent 6abb3e8 commit f1f0be8
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,16 @@ jobs:
- name: Build
run: |
docker run -v $(pwd)/.ccache:/ccache -v $(pwd):/project -e CCACHE_DIR=/ccache packagefoundation/yap-ubuntu-focal:latest build ubuntu-focal packages
mkdir artifacts
sudo mv packages/cryptopp/artifacts/*.deb artifacts
sudo mv packages/cie-middleware/artifacts/*.deb artifacts
for i in $(ls artifacts/); do sha256sum artifacts/$i >> artifacts/SHA256SUMS; done
mkdir artifacts_ci
sudo mv artifacts/*.deb artifacts_ci
for i in $(ls artifacts_ci/); do sha256sum artifacts_ci/$i >> artifacts_ci/SHA256SUMS; done
- name: Archive production artifacts
uses: actions/upload-artifact@v2
with:
name: "cie-middleware-${{ steps.version.outputs.version }}"
path: |
artifacts/*.deb
artifacts_ci/*.deb
artifacts/SHA256SUMS
- uses: "marvinpinto/action-automatic-releases@latest"
Expand All @@ -51,5 +50,5 @@ jobs:
prerelease: false
title: "cie-middleware-${{ steps.version.outputs.version }}"
files: |
artifacts/*.deb
artifacts/SHA256SUMS
artifacts_ci/*.deb
artifacts_ci/SHA256SUMS
21 changes: 11 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
*.VC.db
*.VC.opendb
/cie-java/.gradle
/cie-java/bin
*.a
*.o
*.d
*.o
*.so
.idea/
.trunk
.vscode
/cie-java/.gradle
/cie-java/bin
CMakeCache.txt
CMakeFiles/
Makefile
build/
builddir/
cmake_install.cmake
meson-info/
meson-logs/
meson-private/
gradle/
.idea/
gradlew
gradlew.bat
.trunk
build/
builddir/
meson-info/
meson-logs/
meson-private/
2 changes: 1 addition & 1 deletion packages/cie-middleware/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ build:fedora() {

build:ubuntu() {
export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
pip3 install ninja==1.11.0 meson==0.62.2
pip3 install ninja==1.10.2.3 meson==0.61.1
cp "${srcdir}/libpodofo.a" \
"${srcdir}/${pkgname}-linux-main/libs/lib"

Expand Down

0 comments on commit f1f0be8

Please sign in to comment.