Merge pull request #1744 from scivision/htmlesc
browse.py: use html.escape for python3
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 2febee2..aaa8d92 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -12,25 +12,29 @@
container:
image: centos:7
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
- name: Install dependencies
run: |
- curl -L -O https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2-Linux-x86_64.sh
- chmod +x cmake-3.16.2-Linux-x86_64.sh
- ./cmake-3.16.2-Linux-x86_64.sh --skip-license --prefix=/usr/local
+ curl -L -O https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-Linux-x86_64.sh
+ chmod +x cmake-3.16.4-Linux-x86_64.sh
+ ./cmake-3.16.4-Linux-x86_64.sh --skip-license --prefix=/usr/local
curl -L -O https://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/epel/7/x86_64/Packages/p/p7zip-16.02-10.el7.x86_64.rpm
curl -L -O https://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/epel/7/x86_64/Packages/p/p7zip-plugins-16.02-10.el7.x86_64.rpm
rpm -U --quiet p7zip-16.02-10.el7.x86_64.rpm
rpm -U --quiet p7zip-plugins-16.02-10.el7.x86_64.rpm
yum install -y make gcc-c++
+
- name: Build ninja
shell: bash
run: |
- mkdir build && cd build
- cmake -DCMAKE_BUILD_TYPE=Release ..
- cmake --build . --parallel --config Release
- ctest -vv
- strip ninja
+ cmake -DCMAKE_BUILD_TYPE=Release -B build
+ cmake --build build --parallel --config Release
+ strip build/ninja
+
+ - name: Test ninja
+ run: ctest -vv
+ working-directory: build
+
- name: Create ninja archive
run: |
mkdir artifact
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 2a7c100..a22a9bb 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -11,7 +11,7 @@
runs-on: macOS-latest
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
- name: Install dependencies
run: brew install re2c p7zip cmake
@@ -19,10 +19,12 @@
- name: Build ninja
shell: bash
run: |
- mkdir build && cd build
- cmake -DCMAKE_BUILD_TYPE=Release ..
- cmake --build . --parallel --config Release
- ctest -vv
+ cmake -DCMAKE_BUILD_TYPE=Release -B build
+ cmake --build build --parallel --config Release
+
+ - name: Test ninja
+ run: ctest -vv
+ working-directory: build
- name: Create ninja archive
shell: bash
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index bdec6c9..d961582 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -11,7 +11,7 @@
runs-on: windows-latest
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
- name: Install dependencies
run: choco install re2c
@@ -19,10 +19,12 @@
- name: Build ninja
shell: bash
run: |
- mkdir build && cd build
- cmake -DCMAKE_BUILD_TYPE=Release ..
- cmake --build . --parallel --config Release
- ctest -vv
+ cmake -DCMAKE_BUILD_TYPE=Release -B build
+ cmake --build build --parallel --config Release
+
+ - name: Test ninja
+ run: ctest -vv
+ working-directory: build
- name: Create ninja archive
shell: bash
