Skip to content

Commit

Permalink
feat: Remove Windows release workflow as it breaks because of Windows…
Browse files Browse the repository at this point in the history
… Server 2019
  • Loading branch information
quantumsheep committed Jul 2, 2020
1 parent 99e9584 commit 07b9720
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 59 deletions.
90 changes: 45 additions & 45 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,48 +92,48 @@ jobs:
asset_name: san-${{ github.event.release.tag_name }}-ubuntu-binaries.tar.gz
asset_content_type: application/tar+gzip

build-windows:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest]

steps:
- uses: actions/checkout@v2
with:
submodules: true
path: "."

- uses: ilammy/msvc-dev-cmd@v1

- name: Install 7-zip
run: choco install -y 7zip

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Configure CMake
shell: powershell
working-directory: ${{runner.workspace}}/build
run: cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release

- name: Build
working-directory: ${{runner.workspace}}/build
shell: powershell
run: cmake --build . --config Release

- name: Move bin/Release/san.exe to bin/san.exe
run: mv -Force "$env:GITHUB_WORKSPACE/bin/Release/san.exe" "$env:GITHUB_WORKSPACE/bin/san.exe"

- name: Compress files
run: 7z a -y san-windows-binaries.zip std bin/san.exe examples internal

- name: Upload the artifact
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: san-windows-binaries.zip
asset_name: san-${{ github.event.release.tag_name }}-windows-binaries.zip
asset_content_type: application/zip
# build-windows:
# runs-on: ${{ matrix.os }}
# strategy:
# matrix:
# os: [windows-latest]

# steps:
# - uses: actions/checkout@v2
# with:
# submodules: true
# path: "."

# - uses: ilammy/msvc-dev-cmd@v1

# - name: Install 7-zip
# run: choco install -y 7zip

# - name: Create Build Environment
# run: cmake -E make_directory ${{runner.workspace}}/build

# - name: Configure CMake
# shell: powershell
# working-directory: ${{runner.workspace}}/build
# run: cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release

# - name: Build
# working-directory: ${{runner.workspace}}/build
# shell: powershell
# run: cmake --build . --config Release

# - name: Move bin/Release/san.exe to bin/san.exe
# run: mv -Force "$env:GITHUB_WORKSPACE/bin/Release/san.exe" "$env:GITHUB_WORKSPACE/bin/san.exe"

# - name: Compress files
# run: 7z a -y san-windows-binaries.zip std bin/san.exe examples internal

# - name: Upload the artifact
# uses: actions/upload-release-asset@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# upload_url: ${{ github.event.release.upload_url }}
# asset_path: san-windows-binaries.zip
# asset_name: san-${{ github.event.release.tag_name }}-windows-binaries.zip
# asset_content_type: application/zip
Binary file added dist-debian/libantlr4-runtime.so.4.8
Binary file not shown.
2 changes: 2 additions & 0 deletions include/san/Linker.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ class Linker

if (os == "windows")
{
std::cout << "windows!" << std::endl;

// for (auto &library : libraries)
// {
// auto option = "-l" + library;
Expand Down
31 changes: 17 additions & 14 deletions src/Compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,23 @@ std::vector<std::string> San::Compiler::generate_objects(const std::string &os,
return {};
}

llvm::PassBuilder builder;
llvm::LoopAnalysisManager loop_analisys_manager(false);
llvm::FunctionAnalysisManager function_analisys_manager(false);
llvm::CGSCCAnalysisManager CGSCC_analisys_manager(false);
llvm::ModuleAnalysisManager module_analisys_manager(false);

builder.registerModuleAnalyses(module_analisys_manager);
builder.registerCGSCCAnalyses(CGSCC_analisys_manager);
builder.registerFunctionAnalyses(function_analisys_manager);
builder.registerLoopAnalyses(loop_analisys_manager);
builder.crossRegisterProxies(loop_analisys_manager, function_analisys_manager, CGSCC_analisys_manager, module_analisys_manager);

llvm::ModulePassManager module_pass_manager = builder.buildModuleOptimizationPipeline(optimization_level);
module_pass_manager.run(*module, module_analisys_manager);
if (optimization_level != llvm::PassBuilder::OptimizationLevel::O0)
{
llvm::PassBuilder builder;
llvm::LoopAnalysisManager loop_analisys_manager(true);
llvm::FunctionAnalysisManager function_analisys_manager(true);
llvm::CGSCCAnalysisManager CGSCC_analisys_manager(true);
llvm::ModuleAnalysisManager module_analisys_manager(true);

builder.registerModuleAnalyses(module_analisys_manager);
builder.registerCGSCCAnalyses(CGSCC_analisys_manager);
builder.registerFunctionAnalyses(function_analisys_manager);
builder.registerLoopAnalyses(loop_analisys_manager);
builder.crossRegisterProxies(loop_analisys_manager, function_analisys_manager, CGSCC_analisys_manager, module_analisys_manager);

llvm::ModulePassManager module_pass_manager = builder.buildPerModuleDefaultPipeline(optimization_level, true);
module_pass_manager.run(*module, module_analisys_manager);
}

llvm::legacy::PassManager pass;

Expand Down

0 comments on commit 07b9720

Please sign in to comment.