diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml deleted file mode 100644 index 6c53bca3a..000000000 --- a/.github/workflows/build-beta.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: Beta - Build and push to build branch. - -on: - push: - branches: [trunk] - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0 - - - name: Install NodeJS - uses: actions/setup-node@5b52f097d36d4b0b2f94ed6de710023fbb8b2236 # v3.1.0 - with: - node-version-file: '.nvmrc' - cache: 'yarn' - - - name: Setup PHP with PECL extension - uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2.22.0 - with: - php-version: '7.4' - env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Install all dependencies - run: | - composer install || composer update wporg/* - yarn - - - name: Build - run: yarn workspaces run build - - - name: Trim the repo down to just the theme - run: | - rm -rf source/wp-content/themes/wporg-developer-2023/node_modules - rm -rf source/wp-content/themes/wporg-developer-2023/scss - mv source/wp-content/themes/wporg-developer-2023 $RUNNER_TEMP - git rm -rfq . - rm -rf * - mv $RUNNER_TEMP/wporg-developer-2023/* . - - - name: Add all the theme files - run: | - git add * --force - - - name: Append build number to version - run: | - current_version=$(grep -oP 'Version: \K[0-9]+\.[0-9]+\.[0-9]+' style.css) - new_version="${current_version}-${GITHUB_SHA::7}" - sed -i "s/Version: $current_version/Version: $new_version/" style.css - - - name: Commit and push - uses: actions-js/push@a52398fac807b0c1e5f1492c969b477c8560a0ba # 1.3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: build-beta - force: true - message: 'Build: ${{ github.sha }}' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f214632e9..5a3fd05a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build and push to build branch. on: push: - branches: [old] + branches: [trunk] jobs: build: @@ -34,12 +34,12 @@ jobs: - name: Trim the repo down to just the theme run: | - rm -rf source/wp-content/themes/wporg-developer/node_modules - rm -rf source/wp-content/themes/wporg-developer/scss - mv source/wp-content/themes/wporg-developer $RUNNER_TEMP + rm -rf source/wp-content/themes/wporg-developer-2023/node_modules + rm -rf source/wp-content/themes/wporg-developer-2023/scss + mv source/wp-content/themes/wporg-developer-2023 $RUNNER_TEMP git rm -rfq . rm -rf * - mv $RUNNER_TEMP/wporg-developer/* . + mv $RUNNER_TEMP/wporg-developer-2023/* . - name: Add all the theme files run: |