testing edits

Author: Amxx

.github/workflows/release-upgradeable.yml

@@ -3,39 +3,39 @@ name: Release Upgradeable
 on:
   workflow_dispatch: {}
 
-env:
-  UPGRADEABLE_REPO: OpenZeppelin/openzeppelin-contracts-upgradeable
-
 jobs:
   state:
     name: Check state
     permissions:
       pull-requests: read
-    if: ${{ github.repository == 'OpenZeppelin/openzeppelin-contracts' }}
+    if: ${{ !endsWith(github.repository, '-upgradeable') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
         with:
-          repository: ${{ env.UPGRADEABLE_REPO }}
+          repository: ${{ github.repository }}-upgradeable
           ref: ${{ github.ref }}
       - uses: actions/checkout@v6
         with:
           ref: ${{ github.ref }}
           path: lib/openzeppelin-contracts
       - name: Set up environment
         uses: ./.github/actions/setup
-      - name: Get reference commit
-        id: get-reference-commit
+      - name: Get commits
+        id: get-commits
         run: |
+          echo "upgradeable_commit=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
           cd lib/openzeppelin-contracts
-          echo "commit=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
+          echo "reference_commit=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
       - name: Check upgradeable
         id: check-upgradeable
-        run: bash lib/openzeppelin/scripts/release/workflow/check-upgradeable.sh # TODO: remove path prefix when this is merged and the change are transpiled
+        run: bash scripts/release/workflow/check-upgradeable.sh
         env:
-          REFERENCE_COMMIT: ${{ steps.get-reference-commit.outputs.commit }}
+          REFERENCE_COMMIT: ${{ steps.get-commits.outputs.reference_commit }}
     outputs:
       publish: ${{ steps.check-upgradeable.outcome }}
+      reference_commit: ${{ steps.get-commits.outputs.reference_commit }}
+      upgradeable_commit: ${{ steps.get-commits.outputs.upgradeable_commit }}
       is_prerelease: ${{ steps.check-upgradeable.outputs.is_prerelease }}
 
   # copied from release-cycle.yml
@@ -51,8 +51,9 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
-          repository: ${{ env.UPGRADEABLE_REPO }}
+          repository: ${{ github.repository }}-upgradeable
           ref: ${{ github.ref }}
+          token: ${{ secrets.GH_TOKEN_UPGRADEABLE }}
       - uses: actions/checkout@v6
         with:
           ref: ${{ github.ref }}
@@ -69,18 +70,20 @@ jobs:
         with:
           name: ${{ github.ref_name }}
           path: ${{ steps.pack.outputs.tarball }}
-      - name: Publish
-        run: bash scripts/release/workflow/publish.sh
-        env:
-          TARBALL: ${{ steps.pack.outputs.tarball }}
-          TAG: ${{ steps.pack.outputs.tag }}
+      # - name: Publish
+      #   run: bash scripts/release/workflow/publish.sh
+      #   env:
+      #     TARBALL: ${{ steps.pack.outputs.tarball }}
+      #     TAG: ${{ steps.pack.outputs.tag }}
       - name: Create Github Release
         uses: actions/github-script@v8
         env:
           PRERELEASE: ${{ needs.state.outputs.is_prerelease }}
+          REPO: ${{ context.repo.owner }}-upgradeable
+          SHA: ${{ needs.state.outputs.upgradeable_commit }}
         with:
           github-token: ${{ secrets.GH_TOKEN_UPGRADEABLE }}
-          script: await require('./lib/openzeppelin-contracts/scripts/release/workflow/github-release.js')({ github, context }, '${{ env.UPGRADEABLE_REPO }}') # TODO: remove path prefix when this is merged and the change are transpiled
+          script: await require('./scripts/release/workflow/github-release.js')({ github, context })
     outputs:
       tarball_name: ${{ steps.pack.outputs.tarball_name }}
 

.github/workflows/upgradeable.yml

@@ -1,4 +1,4 @@
-name: transpile upgradeable
+name: Transpile upgradeable
 
 on:
   push:
@@ -9,11 +9,12 @@ on:
 jobs:
   transpile:
     environment: push-upgradeable
+    if: ${{ !endsWith(github.repository, '-upgradeable') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
         with:
-          repository: OpenZeppelin/openzeppelin-contracts-upgradeable
+          repository: ${{ github.repository }}-upgradeable
           fetch-depth: 0
           token: ${{ secrets.GH_TOKEN_UPGRADEABLE }}
       - name: Fetch current non-upgradeable branch

scripts/release/workflow/github-release.js

@@ -2,14 +2,14 @@ const { readFileSync } = require('fs');
 const { join } = require('path');
 const { version } = require(join(__dirname, '../../../package.json'));
 
-module.exports = async ({ github, context }, repo = undefined) => {
+module.exports = async ({ github, context }) => {
   const changelog = readFileSync('CHANGELOG.md', 'utf8');
 
   await github.rest.repos.createRelease({
     owner: context.repo.owner,
-    repo: repo ?? context.repo.repo,
+    repo: process.env.REPO ?? context.repo.repo,
     tag_name: `v${version}`,
-    target_commitish: context.sha,
+    target_commitish: process.env.SHA ?? context.sha,
     body: extractSection(changelog, version),
     prerelease: process.env.PRERELEASE === 'true',
   });