Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(SIMP-10450) GHA: Update ubuntu-16.04 to latest #63

Merged
merged 1 commit into from
Sep 21, 2021
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
4 changes: 2 additions & 2 deletions .github/workflows/pr_glci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
# we restrict ourselves to sending data elsewhere.
glci-syntax:
name: '.gitlab-ci.yml Syntax'
runs-on: ubuntu-16.04
runs-on: ubuntu-latest
outputs:
valid: ${{ steps.validate-glci-file.outputs.valid }}
steps:
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
### examine_contexts:
### name: 'Examine Context contents'
### if: always()
### runs-on: ubuntu-16.04
### runs-on: ubuntu-latest
### needs: [ glci-syntax, contributor-permissions ]
### steps:
### - name: Dump contexts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_glci_cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
### examine_contexts:
### name: 'Examine Context contents'
### if: always()
### runs-on: ubuntu-16.04
### runs-on: ubuntu-latest
### steps:
### - name: Dump contexts
### env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:

# dump_contexts:
# name: 'Examine Context contents'
# runs-on: ubuntu-16.04
# runs-on: ubuntu-latest
# steps:
# - name: Dump contexts
# env:
Expand Down
36 changes: 19 additions & 17 deletions .github/workflows/release_rpms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,15 @@ jobs:
const [owner, repo] = process.env.TARGET_REPO.split('/')
const tag = process.env.RELEASE_TAG
const autocreate_release = (process.env.AUTOCREATE_RELEASE == 'yes')
var release_id
const owner_data = { owner: owner, repo: repo }
const release_data = Object.assign( {tag: tag}, owner_data )
const create_release_data = Object.assign( {tag_name: tag}, owner_data )
const tag_data = Object.assign( {ref: `tags/${tag}`}, owner_data )

function id_from_release(data) {
console.log( `>> Release for ${owner}/${repo}, tag ${tag}` )
console.log( `>>>> release_id: ${data.id}` )
return(data.id)
console.log( ` >> Release for ${owner}/${repo}, tag ${tag}` )
console.log( ` >>>> release_id: ${data.id}` )
return data.id
}

function throw_error_unless_should_autocreate_release(err){
Expand All @@ -124,38 +123,41 @@ jobs:
throw_error_unless_should_autocreate_release(err)
core.warning(`Can't find release for tag ${tag} and tag exists, auto-creating release`)

// Must already have a tag
github.request( 'GET /repos/{owner}/{repo}/git/matching-refs/{ref}', tag_data ).then (
return await github.request( 'GET /repos/{owner}/{repo}/git/matching-refs/{ref}', tag_data ).then (
result => {
// Must already have a tag
if (result.data.length == 0) { throw `Can't find tag ${tag} in repo ${owner}/${repo}` }
return result
}
).then(
result => {
github.request( 'POST /repos/{owner}/{repo}/releases', create_release_data).then(
async result => {
return await github.request( 'POST /repos/{owner}/{repo}/releases', create_release_data).then(
result=>{
release_id = id_from_release(result.data)
console.log(` ++ created auto release ${release_id}` )
return release_id
},
post_err =>{
core.error('Error auto-creating release')
throw post_err
}
)
}
).finally(()=>{
return(release_id)
})
)
}

github.request('GET /repos/{owner}/{repo}/releases/tags/{tag}', release_data ).then(
result => { release_id = id_from_release(result.data) },
err => { release_id = autocreate_release_if_appropriate(err) }
).catch( e => { throw e } ).then(
result => {
await github.request('GET /repos/{owner}/{repo}/releases/tags/{tag}', release_data ).then(
async result => { return await id_from_release(result.data) },
async err => { return await autocreate_release_if_appropriate(err) }
).then(
release_id => {
if (!release_id){
throw `Could not get release for ${tag} for repo ${owner}:${repo}`
}
console.log( ` **** release_id: ${release_id}` )
core.setOutput('id', release_id)
}
},
err => { throw err }
)

- name: Checkout code
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tag_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#
# * The CHANGLOG text is altered to remove RPM-style date headers, which don't
# render well as markdown on the GitHub release pages
#
---
name: 'Tag: Release to GitHub & Puppet Forge'

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validate_tokens.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:
jobs:
puppetforge:
name: 'Puppet Forge token authenticates with API'
runs-on: ubuntu-16.04
runs-on: ubuntu-latest
env:
PUPPETFORGE_API_TOKEN: ${{ secrets.PUPPETFORGE_API_TOKEN }}
FORGE_USER_AGENT: GitHubActions-ForgeReleng-Workflow/0.4.0 (Purpose/forge-ops-for-${{ github.event.repository.name }})
Expand All @@ -42,7 +42,7 @@ jobs:

gitlab:
name: 'GitLab token has scope for developer'
runs-on: ubuntu-16.04
runs-on: ubuntu-latest
env:
GITLAB_API_PRIVATE_TOKEN: ${{ secrets.GITLAB_API_PRIVATE_TOKEN }}
GITLAB_API_URL: ${{ secrets.GITLAB_API_URL }}
Expand All @@ -57,7 +57,7 @@ jobs:

github-no-scope:
name: 'No-scope GitHub token has NO scopes'
runs-on: ubuntu-16.04
runs-on: ubuntu-latest
env:
GITHUB_ORG: ${{ github.event.organization.login }}
NO_SCOPE_GITHUB_TOKEN: ${{secrets.NO_SCOPE_GITHUB_TOKEN}}
Expand Down