diff --git a/.github/scripts/generate-readme.js b/.github/scripts/generate-readme.js index d8e0dc8..bdc20c7 100755 --- a/.github/scripts/generate-readme.js +++ b/.github/scripts/generate-readme.js @@ -3,7 +3,7 @@ const path = require('path'); const readmePath = path.join(__dirname, '../../readme.md'); const changelogPath = path.join(__dirname, '../../CHANGELOG.md'); -const outputPath = path.join(__dirname, '../temp/readme.txt'); +const outputPath = path.join(__dirname, '../../readme.txt'); // Function to detect and remove badge lines function shouldRemoveLine(line) { diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c0d3236..ee6fdfa 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,55 +1,20 @@ -name: Deploy to WordPress SVN - +name: Deploy to WordPress.org on: push: tags: - - 'v*.*.*' - + - "*" jobs: - deploy: + tag: + name: New tag runs-on: ubuntu-latest - steps: - # Step 1: Checkout the repository - - name: Checkout Repository - uses: actions/checkout@v2 - - # Step 2: Set up Node.js (use the latest stable version) - - name: Set up Node.js - uses: actions/setup-node@v2 - with: - node-version: 'lts/*' # Use latest LTS version of Node.js - - # Step 3: Install Node.js dependencies (if you have any, can be skipped if not needed) - # - name: Install dependencies - # run: npm install - - # Step 4: Generate readme.txt using the Node.js script in .github/scripts/ - - name: Generate readme.txt - run: node .github/scripts/generate-readme.js - - # Step 5: Install Subversion - - name: Install Subversion - run: sudo apt-get install subversion - - # Step 6: Deploy to WordPress SVN /trunk/ - - name: Deploy to WordPress SVN /trunk/ - env: - SVN_USERNAME: ${{ secrets.WORDPRESS_USERNAME }} - SVN_PASSWORD: ${{ secrets.WORDPRESS_PASSWORD }} - run: | - svn co https://plugins.svn.wordpress.org/discontinued-products/ svn-dir - rsync -av --delete --exclude=".git" ./ svn-dir/trunk/ - cp .github/temp/readme.txt svn-dir/trunk/readme.txt # Copy the newly generated readme.txt - cd svn-dir - svn add --force trunk/* - svn commit -m "Deploying version ${{ github.ref }}" --username $SVN_USERNAME --password $SVN_PASSWORD --non-interactive - - # Step 7: Create a tag in WordPress SVN /tags/ - - name: Create SVN Tag - env: - SVN_USERNAME: ${{ secrets.WORDPRESS_USERNAME }} - SVN_PASSWORD: ${{ secrets.WORDPRESS_PASSWORD }} - run: | - VERSION=${GITHUB_REF/refs\/tags\/v/} - svn cp https://plugins.svn.wordpress.org/discontinued-products/trunk https://plugins.svn.wordpress.org/discontinued-products/tags/$VERSION -m "Tagging version $VERSION" --username $SVN_USERNAME --password $SVN_PASSWORD --non-interactive + - uses: actions/checkout@master + - name: Generate readme.txt + run: node .github/scripts/generate-readme.js + - name: WordPress Plugin Deploy + uses: 10up/action-wordpress-plugin-deploy@stable + env: + SVN_PASSWORD: ${{ secrets.WORDPRESS_PASSWORD }} + SVN_USERNAME: ${{ secrets.WORDPRESS_USERNAME }} + SLUG: discontinued-products + \ No newline at end of file diff --git a/.gitignore b/.gitignore index 98a72f5..c8ce876 100644 --- a/.gitignore +++ b/.gitignore @@ -28,8 +28,7 @@ yarn-error.log* /public/ ### Ignore the temp readme.txt file ### -/.github/temp/ -/.github/temp/readme.txt +readme.txt ### PHP Composer (if added in the future) ### /vendor/