Skip to content

Commit

Permalink
launch ci
Browse files Browse the repository at this point in the history
  • Loading branch information
ptitjano committed May 15, 2024
1 parent 05c02f0 commit 21f9887
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
15 changes: 8 additions & 7 deletions .docker/qgis3-qt5-build-deps.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,14 @@ RUN apt-get update \

# HANA: client side
# Install hdbsql tool
RUN curl -j -k -L -H "Cookie: eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt" https://tools.hana.ondemand.com/additional/hanaclient-latest-linux-x64.tar.gz --output hanaclient-latest-linux-x64.tar.gz \
&& tar -xvf hanaclient-latest-linux-x64.tar.gz \
&& mkdir /usr/sap \
&& ./client/hdbinst -a client --sapmnt=/usr/sap \
&& rm -rf client \
&& rm hanaclient*
ENV PATH="/usr/sap/hdbclient:${PATH}"
# does not work at the moment
# RUN curl -j -k -L -H "Cookie: eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt" https://tools.hana.ondemand.com/additional/hanaclient-latest-linux-x64.tar.gz --output hanaclient-latest-linux-x64.tar.gz \
# && tar -xvf hanaclient-latest-linux-x64.tar.gz \
# && mkdir /usr/sap \
# && ./client/hdbinst -a client --sapmnt=/usr/sap \
# && rm -rf client \
# && rm hanaclient*
# ENV PATH="/usr/sap/hdbclient:${PATH}"

# MSSQL: client side
# RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ on:
- master
- release-**
- queued_ltr_backports
- benchmark-duckdb-features
# paths cannot be filtered on this workflow on pull request as it is a required one in the branch protection
# feature request and hacks: https://github.heygears.community/t/feature-request-conditional-required-checks/16761

Expand Down Expand Up @@ -129,7 +130,7 @@ jobs:
context: .
file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-build-deps-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}:${{ github.event.pull_request.base.ref || github.ref_name }}
push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
push: false
pull: true
build-args:
DISTRO_VERSION=${{ matrix.distro-version }}
Expand Down Expand Up @@ -346,12 +347,12 @@ jobs:
run: |
echo CTEST_BUILD_NAME: ${CTEST_BUILD_NAME}
- name: Login to Docker Hub
if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
uses: docker/#-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
# - name: Login to Docker Hub
# if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
# uses: docker/#-action@v3
# with:
# username: ${{ secrets.DOCKER_USERNAME }}
# password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build Docker Container with Testing Environment
id: docker-build
Expand All @@ -360,7 +361,7 @@ jobs:
context: .
file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
push: false
pull: true
target: ${{ matrix.docker-target }}
build-args:
Expand Down

0 comments on commit 21f9887

Please # to comment.