Skip to content

Commit

Permalink
Restore everything, because this should work now again.
Browse files Browse the repository at this point in the history
Signed-off-by: Johannes Kalmbach <johannes.kalmbach@gmail.com>
  • Loading branch information
joka921 committed Jan 28, 2025
1 parent 6233581 commit 0e3f3c3
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check_index_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ masterX ]
branches: [ master ]
merge_group:

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ masterX ]
branches: [ master ]
merge_group:

concurrency:
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
# As of Jan, 28, 2025 the default value here (`binfmt:latest`)
# downloads a QEMU version that leads to segfaults in the compiler.
# We therefore fix a working version
# TODO<joka921> GitHub actions now has ARM runners,
# avoid cross-compilation completely
image : 'tonistiigi/binfmt:desktop-v8.1.5-44'
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand All @@ -39,7 +44,6 @@ jobs:
id: pr
run: echo "pr_num=$(git log --format=%s -n 1 | sed -nr 's/.*\(\#([0-9]+)\)/\1/p')" >> $GITHUB_OUTPUT
- name: Build X-86-64
if: false
uses: docker/build-push-action@v6
with:
context: .
Expand All @@ -59,8 +63,7 @@ jobs:
tags: adfreiburg/qlever:test

- name: E2E in Docker
if: false
run: |
run: |
sudo mkdir ${{github.workspace}}/e2e_data
sudo chmod a+rwx ${{github.workspace}}/e2e_data
sudo docker run -i --rm -v "${{github.workspace}}/e2e_data:/app/e2e_data/" --entrypoint e2e/e2e.sh adfreiburg/qlever:test
Expand All @@ -72,7 +75,7 @@ jobs:
# future, then we can set this to `true`. Then the ARM64 image will also
# be built on pull requests which allows for debugging without changing
# the master branch.
if: true
if: false
uses: docker/build-push-action@v6
with:
context: .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ masterX ]
branches: [ master ]
merge_group:

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/native-build-conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ masterX ]
branches: [ master ]
merge_group:

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/native-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ masterX ]
branches: [ master ]
merge_group:

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [master]
pull_request:
branches: [masterX]
branches: [master]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sparql-conformance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ master ]
pull_request:
branches: [ masterX ]
branches: [ master ]
merge_group:

jobs:
Expand Down

0 comments on commit 0e3f3c3

Please sign in to comment.