Skip to content

Commit 26bbfca

Browse files
committed
build image was changed
1 parent c234912 commit 26bbfca

3 files changed

Lines changed: 10 additions & 20 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
prepare: "debian-based"
5151
build_on: linux
5252
parallel: 5
53-
image: foundationdb-build:7.3.0-1.ow.build
54-
owner: owtech
53+
image: foundationdb-build:7.3.0-2.ow.build
54+
owner: ${GITHUB_REPOSITORY_OWNER@L}
5555

5656
runs-on: ${{ matrix.run_on }}
5757
steps:
@@ -181,6 +181,11 @@ jobs:
181181
JOSHUA_AGENT_TAG: "rhel8-20220816"
182182

183183
steps:
184+
- name: Checkout
185+
uses: actions/checkout@v4
186+
with:
187+
path: ${{github.workspace}}/src
188+
184189
- name: Install dependencies
185190
shell: bash
186191
run: |
@@ -228,12 +233,7 @@ jobs:
228233
podman pull ${{ env.JOSHUA_AGENT_URL }}/joshua-agent:${{ env.JOSHUA_AGENT_TAG }}
229234
podman create --name joshua-agent -v /etc/foundationdb:/etc/foundationdb -it joshua-agent:${{ env.JOSHUA_AGENT_TAG }}
230235
podman start joshua-agent
231-
232-
- name: Checkout
233-
uses: actions/checkout@v4
234-
with:
235-
path: ${{github.workspace}}/src
236-
236+
237237
- name: run tests
238238
shell: bash
239239
working-directory: ${{github.workspace}}/fdb-joshua

build-scripts/for-linux/build-on-linux.bash

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ APP_PRMS="\
4949
# set oldest java
5050
JAVA_OLDEST_PATH=$(get_oldest_java_path)
5151

52-
if [[ $(grep '^ID=debian$' /etc/os-release) ]]; then
53-
sudo apt install -y libz-dev
54-
fi
55-
5652
echo "env JAVA_HOME=$JAVA_OLDEST_PATH CC=clang CXX=clang++ cmake -G Ninja $APP_PRMS $SRC_DIR"
5753
env JAVA_HOME=$JAVA_OLDEST_PATH CC=clang CXX=clang++ cmake -G Ninja $APP_PRMS $SRC_DIR
5854

documentation/sphinx/source/guide-common.rst.inc

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,11 @@
3939
.. |package-deb-server| replace::
4040
foundationdb-server\_\ |release|\ -1\_amd64.deb
4141

42-
.. |package-rpm6-clients| replace::
43-
foundationdb-clients-|release|\ -1.el6.x86_64.rpm
44-
45-
.. |package-rpm6-server| replace::
46-
foundationdb-server-|release|\ -1.el6.x86_64.rpm
47-
4842
.. |package-rpm-clients| replace::
49-
foundationdb-clients-|release|\ -1.el7.x86_64.rpm
43+
foundationdb-clients-|release|\ -1.el8.x86_64.rpm
5044

5145
.. |package-rpm-server| replace::
52-
foundationdb-server-|release|\ -1.el7.x86_64.rpm
46+
foundationdb-server-|release|\ -1.el8.x86_64.rpm
5347

5448
.. |package-mac| replace::
5549
FoundationDB-|release|.pkg

0 commit comments

Comments
 (0)