Skip to content

Commit dbaab90

Browse files
committed
Experimental support for CentOS 7
1 parent 9aa25b9 commit dbaab90

File tree

2 files changed

+49
-3
lines changed

2 files changed

+49
-3
lines changed

.github/workflows/CI.yaml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ jobs:
511511
swift test.swift
512512
swiftc test.swift -o test && ./test
513513
514-
test-centos-nightly:
514+
test-centos8-nightly:
515515
container:
516516
image: centos:8
517517
runs-on: ubuntu-latest
@@ -548,6 +548,43 @@ jobs:
548548
swift test.swift
549549
swiftc test.swift -o test && ./test
550550
551+
test-centos7-nightly:
552+
container:
553+
image: centos:7
554+
runs-on: ubuntu-latest
555+
defaults:
556+
run:
557+
shell: bash --login -eo pipefail {0}
558+
steps:
559+
- name: Checkout
560+
uses: actions/checkout@v2
561+
562+
- name: Test swiftbox version
563+
run: |
564+
chmod +x swiftbox.sh
565+
./swiftbox.sh -v
566+
567+
- name: Test swiftbox check nightly
568+
run: ./swiftbox.sh check nightly
569+
570+
- name: Test swiftbox get nightly
571+
run: ./swiftbox.sh get nightly
572+
573+
- name: Install which
574+
run: yum install which -y
575+
576+
- name: Test Swift status
577+
run: |
578+
echo "\$PATH=$PATH"
579+
./swiftbox.sh list
580+
which swift
581+
swiftc -v
582+
583+
- name: Test Swift compiler
584+
run: |
585+
swift test.swift
586+
swiftc test.swift -o test && ./test
587+
551588
test-amzn-nightly:
552589
container:
553590
image: amazonlinux:2

swiftbox.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,17 @@ init-env() {
116116
esac
117117
;;
118118
centos)
119-
$SUDO_FLAG yum install epel-release -y
120-
$SUDO_FLAG yum install --enablerepo=PowerTools binutils gcc git glibc-static libbsd-devel libedit libedit-devel libicu-devel libstdc++-static pkg-config python2 sqlite -y
119+
$SUDO_FLAG yum install binutils gcc git libedit libicu-devel pkg-config python2 sqlite zlib-devel -y
120+
case $SYSTEM_VERSION in
121+
7)
122+
$SUDO_FLAG yum install shadow-utils libbsd-devel glibc-static libstdc++-static libedit-devel -y
123+
sed -i -e 's/\*__block/\*__libc_block/g' /usr/include/unistd.h
124+
;;
125+
8)
126+
$SUDO_FLAG yum install epel-release -y
127+
$SUDO_FLAG yum install --enablerepo=PowerTools libbsd-devel glibc-static libstdc++-static libedit-devel -y
128+
;;
129+
esac
121130
;;
122131
amazonlinux)
123132
$SUDO_FLAG yum install binutils gcc git glibc-static gzip libbsd libcurl libedit libicu sqlite libstdc++-static libuuid libxml2 tar -y

0 commit comments

Comments
 (0)