Skip to content

Commit

Permalink
Merge pull request #311 from cthorn42/maint/main/PA-4856_update_sneak…
Browse files Browse the repository at this point in the history
…_to_mend_attempt_two

(maint) Update to Mend
  • Loading branch information
cthorn42 committed Jan 26, 2023
2 parents b6f48f6 + 0d18bf1 commit edbf55a
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 30 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/mend.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Mend Monitor
on:
push:
branches:
- main
jobs:
mend_monitor:
if: ${{ github.repository_owner == 'puppetlabs' }}
runs-on: ubuntu-latest
name: Mend Monitor
steps:
- name: Checkout current PR
uses: actions/checkout@v3
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
- name: Create lock
run: bundle lock
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Download Mend
run: curl -o wss-unified-agent.jar https://unified-agent.s3.amazonaws.com/wss-unified-agent.jar
- name: Run Mend
run: java -jar wss-unified-agent.jar
env:
WS_APIKEY: ${{ secrets.MEND_API_KEY }}
WS_WSS_URL: https://saas-eu.whitesourcesoftware.com/agent
WS_USERKEY: ${{ secrets.MEND_TOKEN }}
WS_PRODUCTNAME: Puppet Agent
WS_PROJECTNAME: ${{ github.event.repository.name }}
6 changes: 3 additions & 3 deletions .github/workflows/rspec_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
strategy:
matrix:
ruby: [ '2.5', '2.7', 'jruby-9.2.17.0' ]
puppet_version: [ '6', '7' ]
puppet_version: [ '~> 6.29', '~> 7.22' ]
env:
PUPPET_GEM_VERSION: ~> ${{ matrix.puppet_version }}.0
PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
steps:
- name: Checkout current PR
uses: actions/checkout@v3
Expand All @@ -30,7 +30,7 @@ jobs:
ruby-version: ${{ matrix.ruby }}
- name: Update rubygems and install gems
run: |
gem update --system --silent --no-document
gem update --system 3.3.26 --silent --no-document
bundle config set without development
bundle install --jobs 4 --retry 3
- run: bundle exec rake
27 changes: 0 additions & 27 deletions .github/workflows/snyk_monitor.yaml

This file was deleted.

0 comments on commit edbf55a

Please sign in to comment.