Skip to content

Commit

Permalink
Add Github workflows.
Browse files Browse the repository at this point in the history
  • Loading branch information
Holt59 committed Sep 23, 2023
1 parent e935d9a commit d7061cc
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 20 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Build Mob

on:
push:
branches: master
pull_request:
types: [opened, synchronize, reopened]

jobs:
build:
runs-on: windows-2022
steps:
- uses: actions/checkout@v4
- name: Build Mob
shell: pwsh
run: ./bootstrap.ps1 -Verbose
18 changes: 18 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Lint Mob

on:
push:
pull_request:
types: [opened, synchronize, reopened]

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run clang-format
uses: jidicula/[email protected]
with:
clang-format-version: "16"
check-path: "."
exclude-regex: "third-party"
4 changes: 2 additions & 2 deletions src/tasks/boost.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ namespace mob::tasks {
"(\\d+)" // 72
"(?:"
"\\.(\\d+)" // .0
"(?:"
"-(.+)" // -b1-rc1
"(?:" //
"-(.+)" // -b1-rc1
")?"
")?");

Expand Down
10 changes: 5 additions & 5 deletions src/tasks/openssl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,12 @@ namespace mob::tasks {
{
// 1.2.3d
// everything but 1 is optional
std::regex re("(\\d+)" // 1
"(?:"
"\\.(\\d+)" // .2
"(?:"
std::regex re("(\\d+)" // 1
"(?:" //
"\\.(\\d+)" // .2
"(?:" //
"\\.(\\d+)([a-zA-Z]+)?" // .3d
")?"
")?" //
")?");

std::smatch m;
Expand Down
27 changes: 14 additions & 13 deletions src/tasks/pyqt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,19 +208,20 @@ namespace mob::tasks {
op::delete_directory(cx(), source_path() / "build", op::optional);

// build modules
run_tool(process_runner(
process()
.binary(sip::sip_install_exe())
.arg("--confirm-license")
.arg("--verbose", process::log_trace)
.arg("--pep484-pyi")
.arg("--link-full-dll")
.arg("--build-dir", build_path())
// .arg("--enable", "pylupdate") // these are not in modules
//so they .arg("--enable", "pyrcc") // don't get copied below
// .args(zip(repeat("--enable"), modules()))
.cwd(source_path())
.env(pyqt_env)));
run_tool(process_runner(process()
.binary(sip::sip_install_exe())
.arg("--confirm-license")
.arg("--verbose", process::log_trace)
.arg("--pep484-pyi")
.arg("--link-full-dll")
.arg("--build-dir", build_path())
// .arg("--enable",
//"pylupdate") // these are not in modules so
// they .arg("--enable", "pyrcc") // don't
// get copied below
// .args(zip(repeat("--enable"), modules()))
.cwd(source_path())
.env(pyqt_env)));

// done, create the bypass file
built_bypass.create();
Expand Down

0 comments on commit d7061cc

Please sign in to comment.