Skip to content
Merged
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
8 changes: 0 additions & 8 deletions .codeclimate.yml

This file was deleted.

50 changes: 50 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Release
on:
push:
tags:
- '*'
workflow_dispatch:

jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Set up Sonatype Maven
uses: actions/setup-java@v2
with:
java-version: 8
distribution: temurin
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg-passphrase: GPG_PASSPHRASE

- run: mvn install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V
- name: Publish to Maven
env:
MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
run: mvn clean deploy -DskipTests=true -B -U -Prelease

notify-on-failure:
name: Slack notify on failure
if: ${{ failure() }}
needs: [release]
runs-on: ubuntu-latest
steps:
- uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: 'danger'
SLACK_ICON_EMOJI: ':github:'
SLACK_MESSAGE: ${{ format('Failed to release {1}{3} {0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id, ':') }}
SLACK_TITLE: Release Failure
SLACK_USERNAME: GitHub Actions
SLACK_MSG_AUTHOR: twilio-dx
SLACK_FOOTER: Posted automatically using GitHub Actions
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
MSG_MINIMAL: true
42 changes: 42 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Tests
on:
push:
branches: [ '*' ]
pull_request:
branches: [ main ]
schedule:
# Run automatically at 8AM PST Monday-Friday
- cron: '0 15 * * 1-5'
workflow_dispatch:

jobs:
test:
name: Test
runs-on: ubuntu-latest
timeout-minutes: 20
strategy:
matrix:
java: [8, 11]
steps:
- uses: actions/checkout@v2

- name: Run Unit Tests
run: make test-docker version=${{ matrix.java }}

notify-on-failure:
name: Slack notify on failure
if: ${{ failure() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
needs: [test]
runs-on: ubuntu-latest
steps:
- uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: ${{ needs.test.status }}
SLACK_ICON_EMOJI: ':github:'
SLACK_MESSAGE: ${{ format('Build {2} in {1} failed{3} {0}/{1}/actions/runs/{2}', github.server_url, github.repository, github.run_id, ':') }}
SLACK_TITLE: Build Failure
SLACK_USERNAME: GitHub Actions
SLACK_MSG_AUTHOR: twilio-dx
SLACK_FOOTER: Posted automatically using GitHub Actions
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
MSG_MINIMAL: true
24 changes: 0 additions & 24 deletions .maven.xml

This file was deleted.

34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![SendGrid Logo](twilio_sendgrid_logo.png)

[![Travis Badge](https://travis-ci.com/sendgrid/sendgrid-java.svg?branch=main)](https://travis-ci.com/sendgrid/sendgrid-java)
[![BuildStatus](https://github.com/sendgrid/sendgrid-java/actions/workflows/test.yml/badge.svg)](https://github.com/sendgrid/sendgrid-java/actions/workflows/test.yml)
[![Maven Central](https://img.shields.io/maven-central/v/com.sendgrid/sendgrid-java.svg)](http://mvnrepository.com/artifact/com.sendgrid/sendgrid-java)
[![Twitter Follow](https://img.shields.io/twitter/follow/sendgrid.svg?style=social&label=Follow)](https://twitter.com/sendgrid)
[![GitHub contributors](https://img.shields.io/github/contributors/sendgrid/sendgrid-java.svg)](https://github.com/sendgrid/sendgrid-java/graphs/contributors)
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/sendgrid/SendGridTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2193,25 +2193,25 @@ public void test_suppression_invalid_emails__email__delete() throws IOException
}

@Test
public void test_suppression_spam_report__email__get() throws IOException {
public void test_suppression_spam_reports__email__get() throws IOException {
SendGrid sg = new SendGrid("SENDGRID_API_KEY");
sg.addRequestHeader("X-Mock", "200");

Request request = new Request();
request.setMethod(Method.GET);
request.setEndpoint("suppression/spam_report/{email}");
request.setEndpoint("suppression/spam_reports/{email}");
Response response = sg.api(request);
Assert.assertEquals(200, response.getStatusCode());
}

@Test
public void test_suppression_spam_report__email__delete() throws IOException {
public void test_suppression_spam_reports__email__delete() throws IOException {
SendGrid sg = new SendGrid("SENDGRID_API_KEY");
sg.addRequestHeader("X-Mock", "204");

Request request = new Request();
request.setMethod(Method.DELETE);
request.setEndpoint("suppression/spam_report/{email}");
request.setEndpoint("suppression/spam_reports/{email}");
Response response = sg.api(request);
Assert.assertEquals(204, response.getStatusCode());
}
Expand Down
12 changes: 0 additions & 12 deletions src/test/java/com/sendgrid/TestRequiredFilesExist.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,6 @@ public void checkGitIgnoreExists() {
assertTrue(new File("./.gitignore").exists());
}

// ./.travis.yml
@Test
public void checkTravisExists() {
assertTrue(new File("./.travis.yml").exists());
}

// ./.codeclimate.yml
@Test
public void checkCodeClimateExists() {
assertTrue(new File("./.codeclimate.yml").exists());
}

// ./CHANGELOG.md
@Test
public void checkChangelogExists() {
Expand Down