diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..1932c40 Binary files /dev/null and b/.DS_Store differ diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index 8f8613c..b98e947 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -82,42 +82,37 @@ jobs: - name: Lint run: yarn lint - publish: + release: runs-on: ubuntu-latest - needs: [build, lint] - if: "!contains(github.event.head_commit.message, '[skip ci]')" + needs: [install, build, lint] # add e2e and test here if you use it + if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'" steps: - uses: actions/checkout@v2 with: - token: ${{env.GH_TOKEN}} + token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }} - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: - node-version: 12.x + node-version: 16 + cache: 'yarn' - uses: actions/download-artifact@v2 with: name: app-build + # ensure that d2-app-scripts is available + - run: yarn install --frozen-lockfile + + - uses: dhis2/action-semantic-release@master + with: + publish-apphub: true + publish-github: true + github-token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }} + apphub-token: ${{ secrets.DHIS2_BOT_APPHUB_TOKEN }} + - uses: dhis2/deploy-build@master with: # uncomment following line for monorepo apps: #cwd: ./packages/app build-dir: build/app - github-token: ${{ env.GH_TOKEN }} - - release: - runs-on: ubuntu-latest - needs: [publish] - if: "github.event_name == 'push' && !contains(github.event.head_commit.message, '[skip ci]')" - steps: - - uses: actions/checkout@v2 - with: - token: ${{env.GH_TOKEN}} - - - uses: actions/setup-node@v1 - with: - node-version: 12.x - - - name: Publish release to GitHub - run: npx @dhis2/cli-utils release + github-token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }} diff --git a/d2.config.js b/d2.config.js index 4672839..f297d59 100644 --- a/d2.config.js +++ b/d2.config.js @@ -1,4 +1,6 @@ const config = { + id: '22229dce-6f0e-48e0-aa41-4c1bbe683ae2', + minDHIS2Version: '99.9.9', type: 'app', name: 'menu-management', title: 'Menu Management', diff --git a/package.json b/package.json index 224d6d9..c9c51ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "menu-management-app", - "version": "28.2.11", + "version": "99.9.9", "description": "", "license": "BSD-3-Clause", "scripts": {