Skip to content

Commit

Permalink
update ci.yml and use non-deprecated results (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
narimiran authored Jun 28, 2024
1 parent cddb1d5 commit 459fc49
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 17 deletions.
20 changes: 15 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,29 @@ jobs:
cpu: i386
- os: macos
cpu: amd64
- os: macos
cpu: arm64
- os: windows
cpu: amd64
branch: [version-1-6, version-2-0, devel]
include:
- target:
os: linux
builder: ubuntu-20.04
builder: ubuntu-latest
shell: bash
- target:
os: macos
cpu: amd64
builder: macos-13
shell: bash
- target:
os: macos
builder: macos-12
cpu: arm64
builder: macos-latest
shell: bash
- target:
os: windows
builder: windows-2019
builder: windows-latest
shell: msys2 {0}

defaults:
Expand All @@ -44,7 +52,7 @@ jobs:
continue-on-error: ${{ matrix.branch == 'devel' }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install build dependencies (Linux i386)
if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
Expand Down Expand Up @@ -79,7 +87,7 @@ jobs:
- name: Restore Nim DLLs dependencies (Windows) from cache
if: runner.os == 'Windows'
id: windows-dlls-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: external/dlls-${{ matrix.target.cpu }}
key: 'dlls-${{ matrix.target.cpu }}'
Expand All @@ -103,6 +111,8 @@ jobs:
run: |
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
PLATFORM=x64
elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
PLATFORM=arm64
else
PLATFORM=x86
fi
Expand Down
2 changes: 1 addition & 1 deletion nat_traversal.nimble
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ installDirs = @["vendor"]

### Dependencies
requires "nim >= 1.6.0",
"stew"
"results"

proc compileStaticLibraries() =
var cc = getEnv("CC", "")
Expand Down
2 changes: 1 addition & 1 deletion nat_traversal/miniupnpc.nim
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ proc UPNPIGD_IsConnected*(a1: ptr UPNPUrls; a2: ptr IGDdatas): cint {.
# custom wrappers #
###################

import stew/results
import results
export results

type Miniupnp* = ref object
Expand Down
3 changes: 1 addition & 2 deletions nat_traversal/natpmp.nim
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,7 @@ proc strnatpmperr*(t: cint): cstring {.importc: "strnatpmperr", header: "natpmp.
# custom wrappers #
###################

import
stew/results
import results
export results

type NatPmp* {.packed.} = ref object
Expand Down
17 changes: 9 additions & 8 deletions nimble.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"version": 1,
"version": 2,
"packages": {
"stew": {
"version": "0.1.0",
"vcsRevision": "6ad35b876fb6ebe0dfee0f697af173acc47906ee",
"url": "https://github.com/status-im/nim-stew.git",
"results": {
"version": "0.4.0",
"vcsRevision": "193d3c6648bd0f7e834d4ebd6a1e1d5f93998197",
"url": "https://github.com/arnetheduck/nim-results",
"downloadMethod": "git",
"dependencies": [],
"checksums": {
"sha1": "46d58c4feb457f3241e3347778334e325dce5268"
"sha1": "1e0b1f8bea61c3fb496b6942030bee3e05773cd7"
}
}
}
}
},
"tasks": {}
}

0 comments on commit 459fc49

Please sign in to comment.