Skip to content

Commit 3d272e1

Browse files
committed
ci - always checkout libfds master branch
libfds devel branch is not used anymore and is now behind master
1 parent 26d9a0c commit 3d272e1

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,8 @@ jobs:
8585

8686
# Build libfds library ------------------------------------------------------------------
8787
# Note: Master against master branch. Otherwise against debug branch.
88-
- name: Checkout libfds library - master branch
89-
if: github.ref == 'refs/heads/master'
88+
- name: Checkout libfds library
9089
run: git clone --branch master https://github.com/CESNET/libfds.git libfds_build
91-
- name: Checkout libfds library - devel branch
92-
if: github.ref != 'refs/heads/master'
93-
run: git clone --branch devel https://github.com/CESNET/libfds.git libfds_build
9490
- name: Build and install libfds library
9591
working-directory: libfds_build
9692
run: |

.github/workflows/packages.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,8 @@ jobs:
4949
- uses: actions/checkout@v2
5050

5151
# Build LIBFDS DEB package ---------------------------------------------------------------
52-
- name: Checkout libfds library - master branch
53-
if: github.ref == 'refs/heads/master'
54-
run: git clone --branch master https://github.com/CESNET/libfds.git build/libfds_repo
55-
- name: Checkout libfds library - devel branch
56-
if: github.ref != 'refs/heads/master'
57-
run: git clone --branch devel https://github.com/CESNET/libfds.git build/libfds_repo
52+
- name: Checkout libfds library
53+
run: git clone https://github.com/CESNET/libfds.git build/libfds_repo
5854
- name: Build DEBs of libfds library and install them
5955
working-directory: 'build/libfds_repo'
6056
run: |
@@ -160,12 +156,8 @@ jobs:
160156
- uses: actions/checkout@v2
161157

162158
# Build LIBFDS RPM package ---------------------------------------------------------------
163-
- name: Checkout libfds library - master branch
164-
if: github.ref == 'refs/heads/master'
159+
- name: Checkout libfds library
165160
run: git clone --branch master https://github.com/CESNET/libfds.git build/libfds_repo
166-
- name: Checkout libfds library - devel branch
167-
if: github.ref != 'refs/heads/master'
168-
run: git clone --branch devel https://github.com/CESNET/libfds.git build/libfds_repo
169161
- name: Build RPMs of libfds library and install it
170162
working-directory: 'build/libfds_repo'
171163
run: |

0 commit comments

Comments
 (0)