update ci

This commit is contained in:
Andrea Cavalli 2023-05-09 00:38:43 +02:00
parent 7568c310c0
commit 14161a153e
5 changed files with 78 additions and 41 deletions

View File

@ -31,6 +31,7 @@ jobs:
- name: Get version
run: |
set -eo pipefail
# Get latest commit short hash
HASH_VERSION=$(git rev-parse --short HEAD)
@ -124,6 +125,7 @@ jobs:
- name: Install custom dependencies
shell: bash
run: |
set -eo pipefail
echo "REVISION: $REVISION"
if [[ -f "./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh" ]]; then
@ -175,20 +177,26 @@ jobs:
- name: Install vcpkg deps
if: matrix.os == 'windows-2019'
run: |
set -eo pipefail
$VCPKG_DIR/vcpkg install gperf openssl:x64-windows-static zlib:x64-windows-static
shell: bash
- name: Build
shell: bash
run: |
set -eo pipefail
echo "REVISION: $REVISION"
source ./.github/workflows/scripts/build-${SAFE_TYPE}.sh
- id: getfilename
shell: bash
run: echo "::set-output name=file::$(cd generated/target; ls tdli*-natives-*.jar)"
run: |
set -eo pipefail
echo "::set-output name=file::$(cd generated/target; ls tdli*-natives-*.jar)"
- id: getfilepath
shell: bash
run: echo "::set-output name=file::$(ls generated/target/tdli*-natives-*.jar)"
run: |
set -eo pipefail
echo "::set-output name=file::$(ls generated/target/tdli*-natives-*.jar)"
- uses: actions/upload-artifact@v3
with:
name: ${{ steps.getfilename.outputs.file }}
@ -197,6 +205,7 @@ jobs:
if: github.ref == 'refs/heads/develop'
shell: bash
run: |
set -eo pipefail
echo "REVISION: $REVISION"
echo "SSL TYPE: $SSL_TYPE"
@ -208,6 +217,7 @@ jobs:
if: github.ref == 'refs/heads/master'
shell: bash
run: |
set -eo pipefail
echo "REVISION: $REVISION"
echo "SSL TYPE: $SSL_TYPE"

View File

@ -27,4 +27,4 @@ dpkg-deb -xv libclang-common-10-dev_*_arm64.deb /
# Install dependencies
apt-get --assume-yes install libssl-dev:arm64 zlib1g-dev:arm64 openjdk-8-jdk-headless:arm64 libgcc-9-dev:arm64 libc6-dev:arm64
apt-get --assume-yes install libssl-dev:arm64 zlib1g-dev:arm64 openjdk-8-jdk-headless:arm64 libgcc-9-dev:arm64 libc6-dev:arm64 libunwind-dev:arm64

View File

@ -18,7 +18,7 @@ jobs:
if: matrix.os == 'ubuntu-22.04'
uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: sudo make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 libc++-14-dev libc++abi-14-dev libgcc-11-dev libunwind-14-dev libclang-common-14-dev ccache maven
packages: sudo make git zlib1g-dev libssl-dev gperf php-cli cmake openjdk-17-jdk clang-14 libc++-14-dev libc++abi-14-dev libgcc-11-dev libunwind-14-dev libclang-common-14-dev ccache maven
version: 1.0
- name: Install SSH key
uses: shimataro/ssh-key-action@v2
@ -50,6 +50,7 @@ jobs:
- name: Setup variables
shell: bash
run: |
set -eo pipefail
# ====== Variables
export REVISION=${{ github.run_number }}
export GH_MATRIX_OS=${{ matrix.os }}
@ -67,6 +68,7 @@ jobs:
- name: Build
shell: bash
run: |
set -eo pipefail
echo "REVISION: $REVISION"
./.github/workflows/scripts/build-api.sh
@ -74,6 +76,7 @@ jobs:
if: github.ref != 'refs/heads/master'
shell: bash
run: |
set -eo pipefail
echo "REVISION: $REVISION"
echo "Deploying legacy package"
@ -87,6 +90,7 @@ jobs:
if: github.ref == 'refs/heads/master'
shell: bash
run: |
set -eo pipefail
echo "REVISION: $REVISION"
echo "Deploying legacy package"

View File

@ -123,6 +123,22 @@
<classifier>legacy</classifier>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<allowIncompleteProjects>true</allowIncompleteProjects>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<allowIncompleteProjects>true</allowIncompleteProjects>
</configuration>
</plugin>
</plugins>
</build>
</profile>
@ -169,6 +185,49 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>main-javadoc</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<release>17</release>
<quiet>true</quiet>
<notimestamp>true</notimestamp>
<encoding>UTF-8</encoding>
<charset>UTF-8</charset>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
@ -202,46 +261,10 @@
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>main-javadoc</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<release>17</release>
<quiet>true</quiet>
<notimestamp>true</notimestamp>
<encoding>UTF-8</encoding>
<charset>UTF-8</charset>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<groupId>com.outbrain.swinfra</groupId>
<artifactId>ci-friendly-flatten-maven-plugin</artifactId>

@ -1 +1 @@
Subproject commit c77baa48e306371c5a188c49b553003539132eb5
Subproject commit b32514771e84e4df39b33fe07f4bb93a7b32541d