Skip to content

Commit

Permalink
Merge pull request #42 from lilyinstarlight/fix/workflow-cleanup
Browse files Browse the repository at this point in the history
Misc workflow cleanups and URL change
  • Loading branch information
zimbatm authored Oct 25, 2022
2 parents c4950b5 + d710bba commit 4cd5c9b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 17 deletions.
19 changes: 7 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,6 @@ jobs:
with:
fetch-depth: 0

- name: Configure git
run: |
git config user.name 'github-actions[bot]'
git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
- name: Mark full release
uses: actions/github-script@v6
env:
NIX_RELEASE: ${{ needs.update.outputs.nix_release }}
with:
script: await require('.ci/mark-release.js')({require, context, core, github});

- name: Log in to GitHub Container Registry
uses: docker/login-action@v2
with:
Expand All @@ -119,3 +107,10 @@ jobs:
env:
NIX_RELEASE: ${{ needs.update.outputs.nix_release }}
run: .ci/push-containers.sh

- name: Mark full release
uses: actions/github-script@v6
env:
NIX_RELEASE: ${{ needs.update.outputs.nix_release }}
with:
script: await require('.ci/mark-release.js')({require, context, core, github});
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ becomes available in an official release. Or if you like living on the edge.

Pick the release that you want to use. Each release has usage instructions
attached to it:
<https://github.com/numtide/nix-unstable-installer/releases/latest>
<https://github.com/nix-community/nix-unstable-installer/releases/latest>

## How it works

Expand Down
9 changes: 5 additions & 4 deletions update.rb
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def get_eval(eval_id, skip_existing_tag = false)
end

server_url = ENV.fetch('GITHUB_SERVER_URL', 'https://github.com')
repository = ENV.fetch('GITHUB_REPOSITORY', 'numtide/nix-unstable-installer')
repository = ENV.fetch('GITHUB_REPOSITORY', 'nix-community/nix-unstable-installer')

# Rewrite the installer
rewrite("dist/install") do |body|
Expand Down Expand Up @@ -204,9 +204,10 @@ def main(eval_id)

# Output for CI automation
if ENV.fetch("GITHUB_ACTIONS", "false") == "true"
puts "::set-output name=nix_release::#{release_name}"

puts "::set-output name=updated::#{updated}"
File.open(ENV.fetch("GITHUB_OUTPUT"), "a") do |file|
file.puts "nix_release=#{release_name}"
file.puts "updated=#{updated}"
end
end
else
get_eval(eval_id)
Expand Down

0 comments on commit 4cd5c9b

Please sign in to comment.