Skip to content

Commit 5b389a7

Browse files
(PA-7366) Update nightly puppet job to use internal puppet builds
1 parent 9e835fd commit 5b389a7

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

.github/workflows/unit_tests_with_nightly_puppet_gem.yaml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,21 @@ jobs:
88
name: Puppet${{ matrix.puppet_version }} gem on Ruby ${{ matrix.ruby }} on ${{ matrix.os_type }}
99
strategy:
1010
matrix:
11-
os: ['ubuntu-latest', 'macos-latest', 'windows-2022']
12-
puppet_version: ['7', '8']
11+
os: ['ubuntu-latest', 'windows-2022']
12+
puppet_version: ['8']
1313
include:
14-
- puppet_version: '7'
15-
ruby: '2.7'
1614
- puppet_version: '8'
1715
ruby: '3.1'
1816

1917
- os: 'ubuntu-latest'
2018
os_type: 'Linux'
2119
env_set_cmd: 'export '
2220
gem_file: 'puppet-latest.gem'
23-
- os: 'macos-latest'
24-
os_type: 'macOS'
25-
env_set_cmd: 'export '
26-
gem_file: 'puppet-latest-universal-darwin.gem'
21+
# macos is not yet supported by twingate, see https://github.com/Twingate/github-action/issues/43
22+
# - os: 'macos-latest'
23+
# os_type: 'macOS'
24+
# env_set_cmd: 'export '
25+
# gem_file: 'puppet-latest-universal-darwin.gem'
2726
- os: 'windows-2022'
2827
os_type: 'Windows'
2928
env_set_cmd: '$env:'
@@ -36,24 +35,27 @@ jobs:
3635

3736
runs-on: ${{ matrix.os }}
3837
steps:
38+
- name: Install twingate
39+
uses: twingate/github-action@v1
40+
with:
41+
service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
3942
- name: Checkout current PR code
4043
uses: actions/checkout@v4
4144

4245
- name: Install ruby version ${{ matrix.ruby }}
4346
uses: ruby/setup-ruby@v1
4447
with:
4548
ruby-version: ${{ matrix.ruby }}
46-
- name: Circumvent multi_json 1.16.0 on ruby 2.7
47-
if: ${{ matrix.ruby == '2.7' }}
48-
run: gem install multi_json -v 1.15.0
4949

5050
- name: Install the latest nightly build of puppet${{ matrix.puppet_version }} gem
5151
run: |
5252
${{ matrix.extra_steps }}
53-
curl https://nightlies.puppet.com/downloads/gems/puppet${{ matrix.puppet_version }}-nightly/${{ matrix.gem_file }} --output puppet.gem --location
53+
curl https://artifactory.delivery.puppetlabs.net/artifactory/internal_nightly__local/downloads/gems/puppet${{ matrix.puppet_version }}-nightly/${{ matrix.gem_file }} --output puppet.gem --location
5454
gem install puppet.gem -N
5555
5656
- name: Prepare testing environment with bundler
57+
env:
58+
GEM_SOURCE: "https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/"
5759
run: |
5860
git config --global core.longpaths true
5961
bundle config set system 'true'

0 commit comments

Comments
 (0)