Skip to content

Commit 91c0a85

Browse files
ci: migrate to GitHub Actions
Due to the recent changes to the Travis CI platform (see [1]), we will now use GitHub Actions to run the tests. Note: the certificate was updated because it failed with newer Node.js versions ``` _tls_common.js:129 c.context.setCert(cert); ^ Error: error:140AB18F:SSL routines:SSL_CTX_use_certificate:ee key too small at Object.createSecureContext (_tls_common.js:129:17) at Server.setSecureContext (_tls_wrap.js:1328:27) ``` Reference: https://docs.github.com/en/free-pro-team@latest/actions/guides/building-and-testing-java-with-maven [1]: https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing
1 parent 0f3ad9b commit 91c0a85

File tree

7 files changed

+84
-26
lines changed

7 files changed

+84
-26
lines changed

Diff for: .github/workflows/ci.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 0 * * 0'
8+
9+
jobs:
10+
verify:
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
java: [7, 8, 11]
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Setup java
20+
uses: actions/setup-java@v1
21+
with:
22+
java-version: ${{ matrix.java }}
23+
- name: Cache Maven packages
24+
uses: actions/cache@v2
25+
with:
26+
path: ~/.m2
27+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
28+
restore-keys: ${{ runner.os }}-m2
29+
- name: Setup Node.js
30+
uses: actions/setup-node@v1
31+
with:
32+
node-version: 14.x
33+
- name: Run the Maven verify phase
34+
run: mvn verify -Dgpg.skip=true

Diff for: .travis.yml

-7
This file was deleted.

Diff for: README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Socket.IO-client Java
2-
[![Build Status](https://travis-ci.org/socketio/socket.io-client-java.png?branch=master)](https://travis-ci.org/socketio/socket.io-client-java)
2+
3+
[![Build Status](https://github.com/socketio/socket.io-client-java/workflows/CI/badge.svg)](https://github.com/socketio/socket.io-client-java/actions)
34

45
This is the Socket.IO v1.x and v2.x Client Library for Java, which is simply ported from the [JavaScript client](https://github.com/socketio/socket.io-client).
56

Diff for: src/test/java/io/socket/client/SSLConnectionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private static void prepareOkHttpClient() throws GeneralSecurityException, IOExc
6666
TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
6767
tmf.init(ks);
6868

69-
SSLContext sslContext = SSLContext.getInstance("TLSv1");
69+
SSLContext sslContext = SSLContext.getInstance("TLS");
7070
sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
7171

7272
sOkHttpClient = new OkHttpClient.Builder()

Diff for: src/test/resources/cert.pem

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBfDCCASYCCQDTnGd/oOyF1DANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB
3-
VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
4-
cyBQdHkgTHRkMB4XDTE0MDcwNzEzMTUzN1oXDTQxMTEyMTEzMTUzN1owRTELMAkG
5-
A1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0
6-
IFdpZGdpdHMgUHR5IEx0ZDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC6sdeFPlqk
7-
5Pap9woFx1RO05gLidw4MNcL+ZRSxy/sNeE4PhT/RLFcEvnXiHc92wT8YB5Z+WCM
8-
k/jRQ0q19PNPAgMBAAEwDQYJKoZIhvcNAQEFBQADQQCnmm1N/yZiMBZw2JDfbsx3
9-
ecc0BGQ2BwWQuGHzP07TMi1AuOyNZSczl907OphYb9iRC8shZ4O+oXjQAuGTQ1Hp
2+
MIIDazCCAlOgAwIBAgIUPRxvTroGehqqXb8XOvqliIcKyagwDQYJKoZIhvcNAQEL
3+
BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
4+
GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDEyMTAxMDE0MDFaFw0zMDEy
5+
MDgxMDE0MDFaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
6+
HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
7+
AQUAA4IBDwAwggEKAoIBAQCxJ8fUV6sRiNub3Af6jGpGTsWpCqtxBkRSADENMzdT
8+
Twz4wUXXbgv/Tbt3XJovR1RtE9nx+WyA4XqBdfr8s/qDLiVWiyszU9E6jBjQva9B
9+
aGJDZU0BEXjGDTFaE4tL3E/YWZvXVKmrEiq0aZa6anbjOefjG46CnXgfir/TZlx+
10+
8I5s/UmKY5PZ525zLHx/hGbCNCOfdH196CUsV5NNME5OIYIs0+9jLXkn8KS9uEKa
11+
ifhf4rv4G2wo82KkIR1JIkKalH0xb0Z/R6+J2I2ADvxCIVxcGu78Nj0Ms5jpQKM6
12+
GTogpC3hN4fSAVdOLTHmQU1UrOg9btZtB79fYWn1KmMlAgMBAAGjUzBRMB0GA1Ud
13+
DgQWBBSVf9NTqVxHgXqkdleQ4HGxxA8FTTAfBgNVHSMEGDAWgBSVf9NTqVxHgXqk
14+
dleQ4HGxxA8FTTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB8
15+
8Jjqcipf2jHdiRx+4ltJ5y4hitgPsPRsR74L22hHAvICFC+2b2Iu3R1vSBJj5140
16+
HwwH7LUPyt3IKzQP8EOB2MbZsfH10Z3/ChnH1MHmOCDO+Wusi0C0HaOfWp/rAsgY
17+
q+wLMGd3G72/Ba1YdaGHm9SjrziyAEnF5Uz8sUkQrDbZTiWp35PagJTDhdQ6pnUh
18+
JROaoYgNYhGjQ89V1geIpIVTVqoGvLyvAi4k58KQyMUtxi7IEG/IdgopZAL9IL75
19+
D7fMXi21mrb1ohJpk3JlS1Z1XtoynIs4uzlv9wg6yKU5ExZ0QsUwuBekopUuSAvg
20+
XeFIZbJz/WoAo0ZJ6o8Y
1021
-----END CERTIFICATE-----

Diff for: src/test/resources/key.pem

+28-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,28 @@
1-
-----BEGIN RSA PRIVATE KEY-----
2-
MIIBOwIBAAJBALqx14U+WqTk9qn3CgXHVE7TmAuJ3Dgw1wv5lFLHL+w14Tg+FP9E
3-
sVwS+deIdz3bBPxgHln5YIyT+NFDSrX0808CAwEAAQJAIdwLSIEsk2drTRwe1zl1
4-
ku5RTxZruE0zU1qqifDSQjab1StAK1tapxBVRlRlyLCfD704UClsU8sjGtq0Nh6n
5-
kQIhAO2YJM1g0w9bWYet3zC2UdEASPzaQ7llpZmc51NRBx2NAiEAyShICAaclEuy
6-
wwuD4hibV+b6I8CLYoyPBo32EaceN0sCIQCUed6NxfM/houlgV+Xtmfcnzv9X3yx
7-
EDdzjpz08Q7sRQIgZFv1fBOYYSBXQppnJRFzx2pUmCvDHtrTrMh84RfIqnsCIQCf
8-
JjNXXxOaHn1PNZpi6EHReiFQmy1Swt+AxpTsKixsfA==
9-
-----END RSA PRIVATE KEY-----
1+
-----BEGIN PRIVATE KEY-----
2+
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCxJ8fUV6sRiNub
3+
3Af6jGpGTsWpCqtxBkRSADENMzdTTwz4wUXXbgv/Tbt3XJovR1RtE9nx+WyA4XqB
4+
dfr8s/qDLiVWiyszU9E6jBjQva9BaGJDZU0BEXjGDTFaE4tL3E/YWZvXVKmrEiq0
5+
aZa6anbjOefjG46CnXgfir/TZlx+8I5s/UmKY5PZ525zLHx/hGbCNCOfdH196CUs
6+
V5NNME5OIYIs0+9jLXkn8KS9uEKaifhf4rv4G2wo82KkIR1JIkKalH0xb0Z/R6+J
7+
2I2ADvxCIVxcGu78Nj0Ms5jpQKM6GTogpC3hN4fSAVdOLTHmQU1UrOg9btZtB79f
8+
YWn1KmMlAgMBAAECggEAZCjGnTJ3wLEs4KD1Td2nlFqi/GDQ71UIuYfsM7daN1rB
9+
Tb8QOq24UL7lF6Yeck6U2BraJSnNA8z3k0xd/BPRtesYJycF5L4l1EEzIomsFYHr
10+
1IjokYsMSoVY+sGEBv7nkb2QE52FU/gwdtIf6wOYdf3eMhP5bbWUHdk3fVEpSIbN
11+
q9Le23U4Rf+24TUFYQfSmxIADVXnleEBaIBvIj9+uqrQWkY7aTdvdZshuL08irrU
12+
/UekrqsP6uruKPEL2n7xUYjM1MvkAuPmyHjikwevNpPAMuAlFty/ZCNd1fARDfKS
13+
WToRnpgm5u8D414gDCesoyYuy3IbhQ4t95gru2T+3QKBgQDl6sW0+0RlTMA2QOv5
14+
IID9UfO01OhDZZTjy83tse+hqWNN93DengBaK4LLhPxUp0Ff62nICzoeCieXgrUF
15+
rYkF9F1fIa1lOgTemmNoKYm3OzlBfWbZ2zlVPzxg6QlLaYBLc2ZNpAAuuGJjh115
16+
JjDwVh+TN/8MkPDG+dnKb52VLwKBgQDFQLV8UehHFzkirNw1+dYSCkNv9qJwoub9
17+
MD6lI4rl7pi//4i1QdKvJkCSSZ664s9UjyogyI+meRdUS9ea3JYUrWLUCoPr0nfb
18+
5b0ohEb56QhEnCO5xVO49dDpb64b8rPxztLV5Ejr0cnS73UEZSu16ihrWMtxn5w3
19+
sRQ4L7pf6wKBgGDKk2z7kvGqfAjbD/yTSHpcs+Je92DYNPQpaoo0rJM8QkgicWvm
20+
zHMpeii/1ZK1zvnYm3HR+CeJUt2f8yFuyw6sr1pLTToeUMp96HeDdSykTBhb+J6i
21+
geJ3eq25rWYIBjC9ZkYtUr5YdWM9K4bDIzsqpqRNoJvjsNmzeZKVppuVAoGAOwsI
22+
iAL4dTclWhTGAb4b7uB1mTEJJJAOdmEXj1TZQcQuouH5aNAgIV9g2qkAw04a42PL
23+
J28BWMJMUmY1TlyS6/OObowLOu6QBBl7ioI1wJ6ZY/gc1YGUcvvZodZVFnaKmGnh
24+
QDcKANSWBfa5XyxtbhF+McutcgBlwWHW/I6EyisCgYAnJ35YgVEx4hakXQNSwlPR
25+
Y6ArQSHTlsBdpxbE2ekDrqTDfx6r2RVdiq3arZepk4UG9UDVBzCuZfQO8mRRV0lF
26+
9tqssEl8uqJasxrLbY1LAg75btV+8o4UJhutstzzXG2oEY3YlZRbjl8a146jVd09
27+
2oxN1xfkQYQ9cLYTAOfrDw==
28+
-----END PRIVATE KEY-----

Diff for: src/test/resources/keystore.jks

82 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)