Skip to content
Open
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
31 changes: 21 additions & 10 deletions .github/workflows/dub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,24 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
os: [ ubuntu-latest, windows-latest, macos-14 ]
compiler:
- dmd-latest
- ldc-latest
- dmd-2.101.2
- dmd-2.098.1
- ldc-1.31.0 # eq to dmd v2.101.2
- ldc-1.28.1 # eq to dmd v2.098.1
include:
- compiler: ldc-latest
os: macos-latest
exclude:
- compiler: dmd-latest
os: macos-14
- compiler: dmd-2.101.2
os: macos-14
- compiler: dmd-2.098.1
os: macos-14
steps:
- uses: actions/checkout@v3

Expand All @@ -38,16 +48,17 @@ jobs:
with:
compiler: ${{ matrix.compiler }}

- name: Upgrade dub dependencies
uses: WebFreak001/[email protected]
# Broken, try without it for now.
# - name: Upgrade dub dependencies
# uses: WebFreak001/[email protected]

- name: Build Library
run: dub build --build=release --config=library

# cache
- uses: WebFreak001/[email protected]
if: startsWith(matrix.os, 'windows')
with: { store: true }
# - uses: WebFreak001/[email protected]
# if: startsWith(matrix.os, 'windows')
# with: { store: true }

# Older compiler versions
build-older:
Expand Down Expand Up @@ -92,12 +103,12 @@ jobs:
with:
compiler: ${{ matrix.compiler }}

- name: Upgrade dub dependencies
uses: WebFreak001/[email protected]
# - name: Upgrade dub dependencies
# uses: WebFreak001/[email protected]

- name: Build Library
run: dub build --build=release --config=library

# cache
- uses: WebFreak001/[email protected]
with: { store: true }
# - uses: WebFreak001/[email protected]
# with: { store: true }
1 change: 1 addition & 0 deletions dub.sdl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ subPackage "./integration-tests"
subPackage "./integration-tests-vibe"
subPackage "./integration-tests-phobos"
subPackage "./testconn"
dflags "-preview=dip1000"

configuration "library" {
}
Expand Down
2 changes: 1 addition & 1 deletion source/mysql/protocol/comms.d
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ package(mysql) ubyte[] getPacket(Connection conn)
return packet;
}

package(mysql) void send(MySQLSocket _socket, const(ubyte)[] packet)
package(mysql) void send(MySQLSocket _socket, scope const(ubyte)[] packet)
in
{
assert(packet.length > 4); // at least 1 byte more than header
Expand Down
6 changes: 3 additions & 3 deletions source/mysql/protocol/sockets.d
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ interface MySQLSocket
@safe:
void close();
@property bool connected() const;
void read(ubyte[] dst);
void read(scope ubyte[] dst);
void write(const scope ubyte[] bytes);

void acquire();
Expand Down Expand Up @@ -78,7 +78,7 @@ class MySQLSocketPhobos : MySQLSocket
return socket.isAlive;
}

void read(ubyte[] dst)
void read(scope ubyte[] dst)
{
// Note: I'm a little uncomfortable with this line as it doesn't
// (and can't) update Connection._open. Not sure what can be done,
Expand Down Expand Up @@ -138,7 +138,7 @@ version(Have_vibe_core) {
return socket.connected;
}

void read(ubyte[] dst)
void read(scope ubyte[] dst)
{
socket.read(dst);
}
Expand Down
Loading