Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
steps:
- name: Install Dependencies for Ubuntu
# git >= 2.18 required for actions/checkout git support
run: apt-get update && apt-get install -y software-properties-common && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git build-essential clang-8 lld-8 libssl-dev libkrb5-dev libc++-dev wget
run: apt-get update && apt-get install -y software-properties-common && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git build-essential clang libssl-dev libkrb5-dev libc++-dev wget
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true

Expand All @@ -29,9 +29,6 @@ jobs:
CC: clang
CXX: clang++
run: |
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 100
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100
update-alternatives --install /usr/bin/ld ld /usr/bin/lld-8 100
mkdir ~/python
cd ~/python
wget https://www.python.org/ftp/python/3.6.15/Python-3.6.15.tgz
Expand Down Expand Up @@ -68,17 +65,10 @@ jobs:
CXX: clang++
npm_config_clang: 1
GYP_DEFINES: use_obsolete_asm=true
AR: "/usr/lib/llvm-8/bin/llvm-ar"
NM: "/usr/lib/llvm-8/bin/llvm-nm"
# ranlib is not needed, and doesn't support .bc files in .a
RANLIB: /bin/true
# There is a race condition in node/generate that needs to be fixed
# Node 16 changed the logic it uses to select it's UID which means to make node run as root and not 1001, we need to chwon the current directory. More Details:
# https://stackoverflow.com/questions/70298238/getting-eaccess-when-running-npm-8-as-root
run: |
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 100
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100
update-alternatives --install /usr/bin/ld ld /usr/bin/lld-8 100
chown root.root -R .
npm set unsafe-perm true
node utils/retry npm install
Expand Down
26 changes: 0 additions & 26 deletions generate/templates/templates/binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,6 @@
"macOS_deployment_target": "10.11"
},

'target_defaults': {
'default_configuration': 'Debug',
'configurations': {
'Debug': {
'defines': [ 'DEBUG', '_DEBUG' ],
},
'Release': {
'defines': [ 'NDEBUG' ],
'cflags': [ '-flto' ],
'xcode_settings': {
'LLVM_LTO': 'YES'
},
'msvs_settings': {
'VCCLCompilerTool': {
'WholeProgramOptimization': 'true'
},
'VCLibrarianTool': {
},
'VCLinkerTool': {
'LinkTimeCodeGeneration': 1
}
}
}
}
},

"targets": [
{
"target_name": "acquireOpenSSL",
Expand Down
25 changes: 0 additions & 25 deletions vendor/libgit2.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,6 @@
"electron_openssl_root%": "<!(node ../utils/getElectronOpenSSLRoot.js <(module_root_dir))",
"electron_openssl_static%": "<!(node -p \"process.platform !== 'linux' || process.env.NODEGIT_OPENSSL_STATIC_LINK === '1' ? 1 : 0\")",
},
'target_defaults': {
'default_configuration': 'Debug',
'configurations': {
'Debug': {
'defines': [ 'DEBUG', '_DEBUG' ],
},
'Release': {
'defines': [ 'NDEBUG' ],
'cflags': [ '-flto' ],
'xcode_settings': {
'LLVM_LTO': 'YES'
},
'msvs_settings': {
'VCCLCompilerTool': {
'WholeProgramOptimization': 'true'
},
'VCLibrarianTool': {
},
'VCLinkerTool': {
'LinkTimeCodeGeneration': 1
}
}
}
}
},
"targets": [
{
"target_name": "libgit2",
Expand Down