Skip to content

Commit c8170fe

Browse files
committed
Update CI
1 parent ff53521 commit c8170fe

File tree

8 files changed

+65
-46
lines changed

8 files changed

+65
-46
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
\.in\.Rmd$
88
README.md$
99
^configure.log$
10+
^\.github$

.github/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.html

.github/workflows/R-CMD-check.yaml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on:
4+
push:
5+
pull_request:
6+
7+
name: R-CMD-check
8+
9+
jobs:
10+
R-CMD-check:
11+
runs-on: ${{ matrix.config.os }}
12+
13+
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
14+
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
config:
19+
- {os: macOS-latest, r: 'release'}
20+
- {os: windows-latest, r: '3.6'}
21+
- {os: windows-latest, r: '4.1'}
22+
- {os: windows-latest, r: 'release'}
23+
- {os: ubuntu-latest, r: 'release'}
24+
- {os: ubuntu-latest, r: 'oldrel-4'}
25+
26+
env:
27+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
28+
R_KEEP_PKG_SOURCE: yes
29+
30+
steps:
31+
- uses: actions/checkout@v2
32+
33+
- uses: r-lib/actions/setup-pandoc@v2
34+
35+
- name: Install libssh on Linux
36+
if: runner.os == 'Linux'
37+
run: sudo apt-get install libssh-dev
38+
39+
- uses: r-lib/actions/setup-r@v2
40+
with:
41+
r-version: ${{ matrix.config.r }}
42+
http-user-agent: ${{ matrix.config.http-user-agent }}
43+
use-public-rspm: true
44+
45+
- uses: r-lib/actions/setup-r-dependencies@v2
46+
with:
47+
extra-packages: any::rcmdcheck
48+
needs: check
49+
50+
- uses: r-lib/actions/check-r-package@v2
51+
with:
52+
upload-snapshots: true

appveyor.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ elif [ "$PKGCONFIG_CFLAGS" ] || [ "$PKGCONFIG_LIBS" ]; then
3030
PKG_CFLAGS=${PKGCONFIG_CFLAGS}
3131
PKG_LIBS=${PKGCONFIG_LIBS}
3232
elif [ `uname` = "Darwin" ]; then
33-
brew --version 2>/dev/null
33+
test ! "$CI" && brew --version 2>/dev/null
3434
if [ $? -eq 0 ]; then
3535
BREWDIR=$(brew --prefix)
3636
PKG_CFLAGS="-I$BREWDIR/include"

src/myssh.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
#include <Rinternals.h>
55
#include <stdlib.h>
66
#include <string.h>
7-
#ifdef __GNUC__
7+
#if defined(__linux__) && defined(__GNUC__)
8+
#include <stdarg.h>
9+
#include <unistd.h>
10+
#include <inttypes.h>
11+
#include <sys/types.h>
12+
#include <sys/select.h>
13+
#include <netdb.h>
814
#define __attribute__(x)
915
#endif
1016
#include <libssh/libssh.h>

src/scp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* 420
66
*/
77

8-
#include "myssh.h"
98
#include <libgen.h>
9+
#include "myssh.h"
1010

1111
static void assert_scp(int rc, const char * what, ssh_scp scp, ssh_session ssh){
1212
if (rc != SSH_OK){

src/tunnel.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <R.h> /* for R_ProcessEvents() */
2-
#include "myssh.h"
32

43
#include <unistd.h>
54
#include <fcntl.h>
@@ -16,6 +15,8 @@
1615
#include <arpa/inet.h>
1716
#endif
1817

18+
#include "myssh.h"
19+
1920
#ifdef _WIN32
2021
#define NONBLOCK_OK (WSAGetLastError() == WSAEWOULDBLOCK)
2122
#define SHUTDOWN_SIGNAL SD_BOTH

0 commit comments

Comments
 (0)