Skip to content

Commit

Permalink
Revert "Enable debugging for the make/macos-latest build"
Browse files Browse the repository at this point in the history
This reverts commit e66ccb7.
  • Loading branch information
Vladiwostok committed Dec 14, 2023
1 parent e66ccb7 commit 3f7f128
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 21 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
# - name: Setup upterm session
# if: ${{ matrix.build.type == 'make' && matrix.host == 'macos-latest'}}
# uses: lhotari/action-upterm@v1

# Compile D-Scanner and execute all tests without dub
- name: Build and test without dub
if: ${{ matrix.build.type == 'make' }}
Expand Down Expand Up @@ -150,10 +150,6 @@ jobs:
repository: dlang/phobos
path: phobos

- name: Setup upterm session
if: ${{ matrix.build.type == 'make' && matrix.host == 'macos-latest'}}
uses: lhotari/action-upterm@v1

- name: Apply D-Scanner to Phobos
if: ${{ matrix.build.version != 'min libdparse'}} # Older versions crash with "Invalid UTF..."
working-directory: phobos
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ LDC_DEBUG_VERSIONS = -d-version=dparse_verbose
GDC_VERSIONS = -fversion=StdLoggerDisableWarning -fversion=CallbackAPI -fversion=DMDLIB -fversion=MARS
GDC_DEBUG_VERSIONS = -fversion=dparse_verbose

DC_FLAGS += -g -Jbin -Jdmd -Jdmd/compiler/src/dmd/res
DC_FLAGS += -Jbin -Jdmd -Jdmd/compiler/src/dmd/res
override DMD_FLAGS += $(DFLAGS) -w -release -O -od${OBJ_DIR}
override LDC_FLAGS += $(DFLAGS) -O5 -release -oq
override GDC_FLAGS += $(DFLAGS) -O3 -frelease -fall-instantiations
Expand Down
15 changes: 0 additions & 15 deletions src/dscanner/analysis/run.d
Original file line number Diff line number Diff line change
Expand Up @@ -705,18 +705,3 @@ MessageSet analyzeDmd(string fileName, ASTCodegen.Module m, const char[] moduleN

return set;
}

shared static this()
{
// mute dsymbol warnings in tests
static if (__VERSION__ >= 2_101_0)
{
import std.logger : sharedLog, LogLevel;
sharedLog.globalLogLevel = LogLevel.error;
}
else
{
import std.experimental.logger : globalLogLevel, LogLevel;
globalLogLevel = LogLevel.error;
}
}

0 comments on commit 3f7f128

Please sign in to comment.